Bug 1019719 - Follow-up. r=me
authorNick Alexander <nalexander@mozilla.com>
Mon, 21 Jul 2014 12:41:20 -0700
changeset 195376 dc98e9e61e1344dc444c8d6ce687b7ce5463561e
parent 195375 bf683354136b12ac2836e30ae40b12892ded6dbb
child 195377 117b90f99e491dcbb8414b67398218953ca7f7ae
push id46575
push userkwierso@gmail.com
push dateTue, 22 Jul 2014 00:35:21 +0000
treeherdermozilla-inbound@fee5c4bdd713 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1019719
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1019719 - Follow-up. r=me
mobile/android/base/locales/en-US/sync_strings.dtd
mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java
--- a/mobile/android/base/locales/en-US/sync_strings.dtd
+++ b/mobile/android/base/locales/en-US/sync_strings.dtd
@@ -69,21 +69,21 @@
 <!-- Common text -->
 <!ENTITY sync.button.cancel.label 'Cancel'>
 <!ENTITY sync.button.connect.label 'Connect'>
 <!ENTITY sync.button.ok.label 'OK'>
 
 <!-- Account strings -->
 <!ENTITY sync.account.label '&syncBrand.fullName.label; (deprecated)'>
 
-<!-- Localization note (sync.default.client.name): Default string of the "Device name" menu item upon setting up Firefox Sync.
-     The placeholder &formatS1 will be replaced by the name of the Firefox release channel and &formatS2 by the model name of the
-     Android device. Examples:
-     Aurora on GT-I1950
-     Fennec on MI 2S -->
+<!-- Localization note (sync.default.client.name): Default string of the "Device
+     name" menu item upon setting up Firefox Sync.  The placeholder &formatS1
+     will be replaced by the name of the Firefox release channel and &formatS2
+     by the model name of the Android device. Examples look like "Aurora on
+     GT-I1950" and "Fennec on MI 2S". -->
 <!ENTITY sync.default.client.name '&formatS1; on &formatS2;'>
 
 <!-- Bookmark folder strings -->
 <!ENTITY bookmarks.folder.menu.label 'Bookmarks Menu'>
 <!ENTITY bookmarks.folder.places.label ''>
 <!ENTITY bookmarks.folder.tags.label 'Tags'>
 <!ENTITY bookmarks.folder.toolbar.label 'Bookmarks Toolbar'>
 <!ENTITY bookmarks.folder.unfiled.label 'Unsorted Bookmarks'>
--- a/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java
+++ b/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.sync;
 
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.background.common.GlobalConstants;
 import org.mozilla.gecko.sync.delegates.ClientsDataDelegate;
-import org.mozilla.gecko.R;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
 /**
  * A <code>ClientsDataDelegate</code> implementation that persists to a
  * <code>SharedPreferences</code> instance.
  */
@@ -45,17 +45,18 @@ public class SharedPreferencesClientsDat
       .edit()
       .putString(SyncConfiguration.PREF_CLIENT_NAME, clientName)
       .putLong(SyncConfiguration.PREF_CLIENT_DATA_TIMESTAMP, now)
       .commit();
   }
 
   @Override
   public String getDefaultClientName() {
-    String name = GlobalConstants.MOZ_APP_DISPLAYNAME;
+    String name = GlobalConstants.MOZ_APP_DISPLAYNAME; // The display name is never translated.
+    // Change "Firefox Aurora" or similar into "Aurora".
     if (name.contains("Aurora")) {
         name = "Aurora";
     } else if (name.contains("Beta")) {
         name = "Beta";
     } else if (name.contains("Nightly")) {
         name = "Nightly";
     }
     return context.getResources().getString(R.string.sync_default_client_name, name, android.os.Build.MODEL);