Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50d7d19a authored by Jim Miller's avatar Jim Miller
Browse files

Fix issue with german translation of lock times 

The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.

Fixes bug 21602326

Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
parent a4f8aae4

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -653,6 +653,8 @@ 
    <!-- Security settings screen, setting option summary to change screen timeout -->

    <string name="lock_after_timeout_summary"><xliff:g id="timeout_string">%1$s</xliff:g> after sleep</string>

    <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->

    <string name="lock_immediately_summary_with_exception">Immediately after sleep, except when kept unlocked by <xliff:g id="trust_agent_name">%1$s</xliff:g></string>

    <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->

    <string name="lock_after_timeout_summary_with_exception"><xliff:g id="timeout_string">%1$s</xliff:g> after sleep, except when kept unlocked by <xliff:g id="trust_agent_name">%2$s</xliff:g></string>

    <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->

    <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>

src/com/android/settings/SecuritySettings.java

+7 −2
Original line number Diff line number Diff line
@@ -542,8 +542,13 @@ public class SecuritySettings extends SettingsPreferenceFragment 


        Preference preference = getPreferenceScreen().findPreference(KEY_TRUST_AGENT);

        if (preference != null && preference.getTitle().length() > 0) {

            if (Long.valueOf(values[best].toString()) == 0) {

                mLockAfter.setSummary(getString(R.string.lock_immediately_summary_with_exception,

                        preference.getTitle()));

            } else {

                mLockAfter.setSummary(getString(R.string.lock_after_timeout_summary_with_exception,

                        entries[best], preference.getTitle()));

            }

        } else {

            mLockAfter.setSummary(getString(R.string.lock_after_timeout_summary, entries[best]));

        }