blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fixes #2942: Updates strings for l10n (#2950)

master
Sawyer Blatz 2019-05-29 08:47:19 -07:00 committed by Colin Lee
parent ff5eca1537
commit 3fd831cc4d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt
View File

@ -73,7 +73,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat(), CoroutineScope {
// Current sync state
updateLastSyncedTimePref(context!!, preferenceSyncNow)
if (requireComponents.backgroundServices.syncManager.isSyncRunning()) {
preferenceSyncNow.title = getString(R.string.sync_syncing)
preferenceSyncNow.title = getString(R.string.sync_syncing_in_progress)
preferenceSyncNow.isEnabled = false
} else {
preferenceSyncNow.isEnabled = true
@ -152,8 +152,8 @@ class AccountSettingsFragment : PreferenceFragmentCompat(), CoroutineScope {
override fun onStarted() {
CoroutineScope(Dispatchers.Main).launch {
val pref = findPreference<Preference>(context!!.getPreferenceKey(R.string.pref_key_sync_now))
view?.announceForAccessibility(getString(R.string.sync_syncing))
pref?.title = getString(R.string.sync_syncing)
view?.announceForAccessibility(getString(R.string.sync_syncing_in_progress))
pref?.title = getString(R.string.sync_syncing_in_progress)
pref?.isEnabled = false
updateSyncingItemsPreference()

4
app/src/main/res/values/strings.xml
View File

@ -156,7 +156,7 @@
<!-- Preference displays and allows changing current FxA device name -->
<string name="preferences_sync_device_name">Device name</string>
<!-- Label indicating that sync is in progress -->
<string name="sync_syncing">Syncing…</string>
<string name="sync_syncing_in_progress">Syncing…</string>
<!-- Label summary indicating that sync failed. The first parameter is the date stamp showing last time it succeeded -->
<string name="sync_failed_summary">Sync failed. Last success: %s</string>
<!-- Label summary showing never synced -->
@ -581,7 +581,7 @@
<string name="preferences_delete_browsing_data_tabs_subtitle">%d tabs</string>
<!-- Title for the data and history items in Delete browsing data -->
<string name="preferences_delete_browsing_data_browsing_data_title">Browsing history and site data</string>
<!-- Subtitle for the data and history items item in Delete browsing data, parameter will be replaced with the
<!-- Subtitle for the data and history items in delete browsing data, parameter will be replaced with the
number of history items the user has -->
<string name="preferences_delete_browsing_data_browsing_data_subtitle">%d addresses</string>
<!-- Title for the collections item in Delete browsing data -->