From c803c9f4997db48d1c32e8ab7071826f67d6e5f8 Mon Sep 17 00:00:00 2001 From: Mike Connor Date: Wed, 28 Oct 2009 03:42:35 -0400 Subject: [PATCH] bug 485108 - drop status dialog, show status including engines on statusbar, remove dead status bits --- services/sync/locales/en-US/about.properties | 93 ------------------- .../sync/locales/en-US/engines.properties | 8 ++ services/sync/locales/en-US/status.dtd | 2 - services/sync/locales/en-US/status.properties | 39 -------- services/sync/locales/en-US/sync.properties | 3 + services/sync/modules/engines.js | 10 +- services/sync/modules/engines/bookmarks.js | 2 +- services/sync/modules/engines/clients.js | 2 +- services/sync/modules/engines/cookies.js | 2 +- services/sync/modules/engines/extensions.js | 2 +- services/sync/modules/engines/forms.js | 2 +- services/sync/modules/engines/history.js | 2 +- services/sync/modules/engines/input.js | 2 +- services/sync/modules/engines/microformats.js | 2 +- services/sync/modules/engines/passwords.js | 2 +- services/sync/modules/engines/plugins.js | 2 +- services/sync/modules/engines/prefs.js | 2 +- services/sync/modules/engines/tabs.js | 2 +- services/sync/modules/engines/themes.js | 2 +- services/sync/modules/util.js | 2 +- 20 files changed, 34 insertions(+), 149 deletions(-) delete mode 100644 services/sync/locales/en-US/about.properties create mode 100644 services/sync/locales/en-US/engines.properties delete mode 100644 services/sync/locales/en-US/status.dtd delete mode 100644 services/sync/locales/en-US/status.properties diff --git a/services/sync/locales/en-US/about.properties b/services/sync/locales/en-US/about.properties deleted file mode 100644 index 9505c4be0db8..000000000000 --- a/services/sync/locales/en-US/about.properties +++ /dev/null @@ -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. diff --git a/services/sync/locales/en-US/engines.properties b/services/sync/locales/en-US/engines.properties new file mode 100644 index 000000000000..ff2fb7fe55a5 --- /dev/null +++ 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 diff --git a/services/sync/locales/en-US/status.dtd b/services/sync/locales/en-US/status.dtd deleted file mode 100644 index 42744bfe7e44..000000000000 --- a/services/sync/locales/en-US/status.dtd +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/services/sync/locales/en-US/status.properties b/services/sync/locales/en-US/status.properties deleted file mode 100644 index 05f87cfce094..000000000000 --- a/services/sync/locales/en-US/status.properties +++ /dev/null @@ -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 - - diff --git a/services/sync/locales/en-US/sync.properties b/services/sync/locales/en-US/sync.properties index 28d39ef53c12..147d996fa087 100644 --- 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... diff --git a/services/sync/modules/engines.js b/services/sync/modules/engines.js index 54c8f3571a60..98e2e6ea444d 100644 --- 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:"); diff --git a/services/sync/modules/engines/bookmarks.js b/services/sync/modules/engines/bookmarks.js index 96c4e4322971..6fe3fb1f4744 100644 --- 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, diff --git a/services/sync/modules/engines/clients.js b/services/sync/modules/engines/clients.js index 399e681761d0..0b87602218bf 100644 --- 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, diff --git a/services/sync/modules/engines/cookies.js b/services/sync/modules/engines/cookies.js index 5cc46e1485e4..7c31eeb47279 100644 --- 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/"; }, diff --git a/services/sync/modules/engines/extensions.js b/services/sync/modules/engines/extensions.js index 2a09deea19fe..cf482d79b9bb 100644 --- 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", diff --git a/services/sync/modules/engines/forms.js b/services/sync/modules/engines/forms.js index ab4faa22c944..d24063d546de 100644 --- 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, diff --git a/services/sync/modules/engines/history.js b/services/sync/modules/engines/history.js index 51d2664e26e0..e92483da9c74 100644 --- 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, diff --git a/services/sync/modules/engines/input.js b/services/sync/modules/engines/input.js index 9ef24abf8464..c2dd16cb27e2 100644 --- 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/"; }, diff --git a/services/sync/modules/engines/microformats.js b/services/sync/modules/engines/microformats.js index 3cd47656520d..9c9f3f8d6608 100644 --- 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", diff --git a/services/sync/modules/engines/passwords.js b/services/sync/modules/engines/passwords.js index fb4a42e69fe1..d221c5f54270 100644 --- 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, diff --git a/services/sync/modules/engines/plugins.js b/services/sync/modules/engines/plugins.js index 94c61aeec424..0ac1790ea150 100644 --- 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", diff --git a/services/sync/modules/engines/prefs.js b/services/sync/modules/engines/prefs.js index 7c880092f607..614a83e0c108 100644 --- 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, diff --git a/services/sync/modules/engines/tabs.js b/services/sync/modules/engines/tabs.js index 0c3fc836f29a..a336bc05e834 100644 --- 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, diff --git a/services/sync/modules/engines/themes.js b/services/sync/modules/engines/themes.js index 98025bd1f806..b9e2674ab300 100644 --- 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", diff --git a/services/sync/modules/util.js b/services/sync/modules/util.js index e56ccb8e07ef..ef294c474c74 100644 --- 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)));