bug 485108 - drop status dialog, show status including engines on statusbar, remove dead status bits

2024-10-14 05:45:37 +00:00 · 2009-10-28 03:42:35 -04:00 · 2009-10-28 03:42:35 -04:00 · c803c9f499
commit c803c9f499
parent ae0b04206e
20 changed files with 34 additions and 149 deletions
--- a/services/sync/locales/en-US/about.properties
+++ b/services/sync/locales/en-US/about.properties
@ -1,93 +0,0 @@
-# Top menus
-
-user-menu-offline       = Signed out
-user-menu-signing-in    = Signing in...
-user-menu-online        = Signed in as %S
-sign-out-item           = Sign out
-my-account-item         = My Account
-
-advanced-menu-title     = Advanced
-server-settings-item    = Server settings
-activity-log-item       = Activity Log
-
-# Status messages (below the arrow in the center)
-
-status-offline          = (offline)
-status-signing-in       = (signing in...)
-status-idle             = (idle)
-status-sync             = (syncing)
-
-# Bubbles
-
-prev                    = prev
-next                    = next
-
-welcome-title           = Welcome To Sync
-welcome-1               = Do you already have a Weave account?
-welcome-yes             = yes
-welcome-no              = no
-
-my-account-change-password   = change password
-my-account-change-passphrase = change passphrase
-
-signin-title            = Sign Into Weave
-signin-newacct          = new user
-signin-username         = 
-signin-password         = 
-signin-passphrase       = 
-signin-next             = sign in
-
-newacct-title           = New Account
-newacct-username        = 
-newacct-password        = 
-newacct-passphrase      = 
-newacct-email           = 
-newacct-tos-label       = I agree to the %S
-newacct-tos             = Terms of Service
-captcha-response        = 
-user-taken-password     = My username won't work
-
-willsync-title          = Account Created!
-willsync-1              = Sync will begin in %S seconds...
-willsync-config         = choose what to sync
-
-setup-title             = Sync Settings
-setup-1                 = Check the things you'd like to sync:
-setup-sync              = sync now
-
-clientinfo-type-desktop = desktop
-clientinfo-type-laptop  = laptop
-clientinfo-type-mobile  = mobile
-clientinfo-prefs        = choose what to sync
-
-cloudinfo-title         = What's In The Cloud?
-cloudinfo-erase         = erase
-erase-title             = Erase Server Data
-erase-warning           = This will delete all data on the Weave server.\n\nAre you sure you want to do this?
-
-# Help items
-
-help-forgot-password    = I forgot my password
-forgot-password-1       = Type in your username and we'll send you an email so you can reset it:
-forgot-password-box     = username
-forgot-password-ok      = send email
-
-help-forgot-passphrase  = I forgot my passphrase
-forgot-passphrase-1     = You can pick a new passphrase, but all your server data will need to be deleted (it cannot be recovered).
-forgot-passphrase-2     = To go ahead, click the button below:
-forgot-passphrase-ok    = reset passphrase
-
-help-helpme             = I'm stuck! What do I do?
-help-helpme-1           = If you're stuck, you might want to try the %S or the %S for help.
-help-helpme-faq         = FAQ
-help-helpme-forum       = Weave discussion forum
-
-help-user-taken         = My username won't work
-help-user-taken-1       = Your username might be taken, try adding numbers or additional words to it.
-help-user-taken-2       = Additionally, you can't use special symbols or spaces inside usernames.
-
-help-newacct-pass       = Weave won't accept my password or passphrase
-help-newacct-pass-1     = The password and passphrase must be different from each other.
-
-help-no-captcha         = I can't see the verification image
-help-no-captcha-1       = Some add-ons can interfere with the verification image.  Try disabling NoScript or similar add-ons.
--- a/services/sync/locales/en-US/engines.properties
+++ b/services/sync/locales/en-US/engines.properties
@ -0,0 +1,8 @@
+#bookmarks
+clients   = Client Data
+bookmarks = Bookmarks
+tabs      = Tabs
+forms     = Form History
+history   = Browsing History
+prefs     = Preferences
+passwords = Passwords
--- a/services/sync/locales/en-US/status.dtd
+++ b/services/sync/locales/en-US/status.dtd
@ -1,2 +0,0 @@
-<!ENTITY dialog.title         "Syncing with Weave">
-<!ENTITY status.title         "Starting Sync Engine">
--- a/services/sync/locales/en-US/status.properties
+++ b/services/sync/locales/en-US/status.properties
@ -1,39 +0,0 @@
-dialog.accept = Hide
-
-status.wait = Waiting for Current Sync to Finish
-status.active = Syncing with Weave
-status.success = Sync Complete
-status.error = Sync Failed (%1$S)
-status.closing = Closing...
-
-status.engine.start = Starting Sync
-status.engine.process-incoming = Processing Incoming Items
-status.engine.upload-outgoing = Uploading Outgoing Items
-
-status.downloading-status = Downloading Status from Server
-status.uploading-status = Updating Status on Server
-
-status.downloading-snapshot = Downloading Snapshot from Server
-status.uploading-snapshot = Uploading Initial Snapshot to Server
-
-status.generating-random-key = Generating Random Key
-status.encrypting-key = Encrypting Key
-status.uploading-key = Uploading Key to Server
-status.downloading-keyring = Downloading Key Ring from Server
-status.decrypting-key = Decrypting Key
-
-status.downloading-deltas = Downloading Deltas from Server
-status.uploading-deltas = Updating Deltas on Server
-
-status.calculating-differences = Calculating Differences
-status.reconciling-updates = Reconciling Differences
-status.applying-changes = Applying Required Changes
-status.no-changes-required = No Changes Needed
-
-status.encoding-json = Encoding Data
-status.decoding-json = Decoding Data
-
-status.encrypting = Encrypting Data
-status.decrypting = Decrypting Data
-
-
--- a/services/sync/locales/en-US/sync.properties
+++ b/services/sync/locales/en-US/sync.properties
@ -4,6 +4,9 @@ lastSync.label = Last Update: %S
 # %S is the username logged in
 connected.label = Connected: %S

+# %S is the engine being synced
+syncing.label = Weave is syncing: %S
+
 #weaveButtonOffline.label = Sign In
 #weaveButtonOnline.label = Weave
 #shareBookmark.menuItem = Share This Folder...
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@ -136,7 +136,7 @@ EngineManagerSvc.prototype = {
 function Engine() { this._init(); }
 Engine.prototype = {
  name: "engine",
-  displayName: "Boring Engine",
+  _displayName: "Boring Engine",
  description: "An engine example - it doesn't actually sync anything",
  logName: "Engine",

@ -161,6 +161,14 @@ Engine.prototype = {
      this.__tracker = new this._trackerObj();
    return this.__tracker;
  },
+  
+  get displayName() {
+    try {
+      return Str.engines.get(this.name);
+    } catch (e) {}
+    
+    return this._displayName;
+  },

  _init: function Engine__init() {
    this._notify = Utils.notify("weave:engine:");
--- a/services/sync/modules/engines/bookmarks.js
+++ b/services/sync/modules/engines/bookmarks.js
@ -88,7 +88,7 @@ function BookmarksEngine() {
 BookmarksEngine.prototype = {
  __proto__: SyncEngine.prototype,
  name: "bookmarks",
-  displayName: "Bookmarks",
+  _displayName: "Bookmarks",
  description: "Keep your favorite links always at hand",
  logName: "Bookmarks",
  _recordObj: PlacesItem,
--- a/services/sync/modules/engines/clients.js
+++ b/services/sync/modules/engines/clients.js
@ -58,7 +58,7 @@ function ClientEngine() {
 ClientEngine.prototype = {
  __proto__: SyncEngine.prototype,
  name: "clients",
-  displayName: "Clients",
+  _displayName: "Clients",
  description: "Sync information about other clients connected to Weave Sync",
  logName: "Clients",
  _storeObj: ClientStore,
--- a/services/sync/modules/engines/cookies.js
+++ b/services/sync/modules/engines/cookies.js
@ -53,7 +53,7 @@ CookieEngine.prototype = {
  __proto__: SyncEngine.prototype,

  get name() { return "cookies"; },
-  get displayName() { return "Cookies"; },
+  get _displayName() { return "Cookies"; },
  get logName() { return "CookieEngine"; },
  get serverPrefix() { return "user-data/cookies/"; },

--- a/services/sync/modules/engines/extensions.js
+++ b/services/sync/modules/engines/extensions.js
@ -44,7 +44,7 @@ ExtensionEngine.prototype = {
  get enabled() null, // XXX force disabled in-case the pref was somehow set
  __proto__: SyncEngine.prototype,

-  displayName: "Extensions",
+  _displayName: "Extensions",
  description: "",
  logName: "Extensions",
  name: "extensions",
--- a/services/sync/modules/engines/forms.js
+++ b/services/sync/modules/engines/forms.js
@ -56,7 +56,7 @@ function FormEngine() {
 FormEngine.prototype = {
  __proto__: SyncEngine.prototype,
  name: "forms",
-  displayName: "Forms",
+  _displayName: "Forms",
  description: "Take advantage of form-fill convenience on all your devices",
  logName: "Forms",
  _storeObj: FormStore,
--- a/services/sync/modules/engines/history.js
+++ b/services/sync/modules/engines/history.js
@ -76,7 +76,7 @@ function HistoryEngine() {
 HistoryEngine.prototype = {
  __proto__: SyncEngine.prototype,
  name: "history",
-  displayName: "History",
+  _displayName: "History",
  description: "All the sites you've been to.  Take your awesomebar with you!",
  logName: "History",
  _recordObj: HistoryRec,
--- a/services/sync/modules/engines/input.js
+++ b/services/sync/modules/engines/input.js
@ -54,7 +54,7 @@ InputEngine.prototype = {
  __proto__: SyncEngine.prototype,

  get name() { return "input"; },
-  get displayName() { return "Input History (Location Bar)"; },
+  get _displayName() { return "Input History (Location Bar)"; },
  get logName() { return "InputEngine"; },
  get serverPrefix() { return "user-data/input/"; },

--- a/services/sync/modules/engines/microformats.js
+++ b/services/sync/modules/engines/microformats.js
@ -44,7 +44,7 @@ MicroFormatEngine.prototype = {
  get enabled() null, // XXX force disabled in-case the pref was somehow set
  __proto__: SyncEngine.prototype,

-  displayName: "MicroFormats",
+  _displayName: "MicroFormats",
  description: "",
  logName: "MicroFormats",
  name: "microformats",
--- a/services/sync/modules/engines/passwords.js
+++ b/services/sync/modules/engines/passwords.js
@ -55,7 +55,7 @@ function PasswordEngine() {
 PasswordEngine.prototype = {
  __proto__: SyncEngine.prototype,
  name: "passwords",
-  displayName: "Passwords",
+  _displayName: "Passwords",
  description: "Forget all your passwords, Weave will remember them for you",
  logName: "Passwords",
  _storeObj: PasswordStore,
--- a/services/sync/modules/engines/plugins.js
+++ b/services/sync/modules/engines/plugins.js
@ -44,7 +44,7 @@ PluginEngine.prototype = {
  get enabled() null, // XXX force disabled in-case the pref was somehow set
  __proto__: SyncEngine.prototype,

-  displayName: "Plugins",
+  _displayName: "Plugins",
  description: "",
  logName: "Plugins",
  name: "plugins",
--- a/services/sync/modules/engines/prefs.js
+++ b/services/sync/modules/engines/prefs.js
@ -58,7 +58,7 @@ function PrefsEngine() {
 PrefsEngine.prototype = {
  __proto__: SyncEngine.prototype,
  name: "prefs",
-  displayName: "Preferences",
+  _displayName: "Preferences",
  description: "Synchronize your home page, selected persona, and more",
  logName: "Prefs",
  _storeObj: PrefStore,
--- a/services/sync/modules/engines/tabs.js
+++ b/services/sync/modules/engines/tabs.js
@ -58,7 +58,7 @@ function TabEngine() {
 TabEngine.prototype = {
  __proto__: SyncEngine.prototype,
  name: "tabs",
-  displayName: "Tabs",
+  _displayName: "Tabs",
  description: "Access tabs from other devices via the History menu",
  logName: "Tabs",
  _storeObj: TabStore,
--- a/services/sync/modules/engines/themes.js
+++ b/services/sync/modules/engines/themes.js
@ -44,7 +44,7 @@ ThemeEngine.prototype = {
  get enabled() null, // XXX force disabled in-case the pref was somehow set
  __proto__: SyncEngine.prototype,

-  displayName: "Themes",
+  _displayName: "Themes",
  description: "",
  logName: "Themes",
  name: "themes",
--- a/services/sync/modules/util.js
+++ b/services/sync/modules/util.js
@ -798,5 +798,5 @@ Svc.Prefs = new Preferences(PREFS_BRANCH);
 ].forEach(function(lazy) Utils.lazySvc(Svc, lazy[0], lazy[1], Ci[lazy[2]]));

 let Str = {};
-["about", "errors", "sync"]
+["engines", "errors", "sync"]
  .forEach(function(lazy) Utils.lazy2(Str, lazy, Utils.lazyStrings(lazy)));