Fix mozilla/thimble.mozilla.org#1361 - Localize "Move File" extension

mozilla · Feb 25, 2016 · fc7617e · fc7617e
1 parent 6dc813c
commit fc7617e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/locales/en-US/messages.properties b/locales/en-US/messages.properties
@@ -124,3 +124,14 @@ CMD_ENABLE_QUICK_VIEW=Quick View on Hover
 # extensions/default/WebPlatformDocs
 
 DOCS_MORE_LINK=Read more
+
+# extensions/default/bramble-move-file
+
+CMD_MOVE_FILE=Move To...
+PROJECT_ROOT=Project Root
+PICK_A_FOLDER_TO_MOVE_TO=Pick a folder
+ERROR_MOVING_FILE_DIALOG_HEADER=Move Error
+# {0} is the name of the file/folder being moved and {1} is the name of the folder it is being moved to
+UNEXPECTED_ERROR_MOVING_FILE=An unexpected error occurred when attempting to move {0} to {1}
+# {0} is the name of the file/folder being moved and {1} is the name of the folder it is being moved to
+ERROR_MOVING_FILE_SAME_NAME=A file or folder with the name {0} already exists in {1}. Consider renaming either one to continue."
diff --git a/src/extensions/default/bramble-move-file/MoveToDialog.js b/src/extensions/default/bramble-move-file/MoveToDialog.js
@@ -16,6 +16,8 @@ define(function (require, exports, module) {
     var FileSystem             = brackets.getModule("filesystem/FileSystem");
     var BracketsFiler          = brackets.getModule("filesystem/impls/filer/BracketsFiler");
     var Path                   = BracketsFiler.Path;
+    var Strings                = brackets.getModule("strings");
+    var StringUtils            = brackets.getModule("utils/StringUtils");
 
     var MoveUtils              = require("MoveUtils");
     var dialogTemplate         = require("text!htmlContent/move-to-dialog.html");
@@ -74,14 +76,16 @@ define(function (require, exports, module) {
 
         if(error.type === MoveUtils.NEEDS_RENAME) {
             Dialogs.showModalDialog(DefaultDialogs.DIALOG_ID_ERROR,
-                "Move Error",
-                "A file or folder with the name " + from + " already exists in " + to + ". Consider renaming either one to continue.");
+                Strings.ERROR_MOVING_FILE_DIALOG_HEADER,
+                StringUtils.format(Strings.ERROR_MOVING_FILE_SAME_NAME, from, to)
+            );
             return;
         }
 
         Dialogs.showModalDialog(DefaultDialogs.DIALOG_ID_ERROR,
-            "Move Error",
-            "An unexpected error occurred when attempting to move " + from + " to " + to);
+            Strings.ERROR_MOVING_FILE_DIALOG_HEADER,
+            StringUtils.format(Strings.ERROR_MOVING_FILE, from, to)
+        );
 
         console.error("[Bramble] Failed to move `", source, "` to `", destination, "` with: ", error);
     }
@@ -136,7 +140,7 @@ define(function (require, exports, module) {
         var parentPath = projectRoot.replace(/\/?$/, "");
         var directories = [{
             path: parentPath,
-            name: "Project Root",
+            name: Strings.PROJECT_ROOT,
             children: false,
             indent: 0,
             noIcon: true,
@@ -194,7 +198,10 @@ define(function (require, exports, module) {
 
             var dialogContents = {
                 defaultPath: defaultPath,
-                source: context.fullPath
+                source: context.fullPath,
+                PICK_A_FOLDER_TO_MOVE_TO: Strings.PICK_A_FOLDER_TO_MOVE_TO,
+                OK: Strings.OK,
+                CANCEL: Strings.CANCEL
             };
             var subdirectoryContents = {
                 subdirectories: directoryTreeTemplate

diff --git a/src/extensions/default/bramble-move-file/htmlContent/move-to-dialog.html b/src/extensions/default/bramble-move-file/htmlContent/move-to-dialog.html
@@ -1,6 +1,6 @@
 <div class="move-to-dialog modal">
     <div class="modal-header">
-        <h1 class="dialog-title">Pick a folder</h1>
+        <h1 class="dialog-title">{{ PICK_A_FOLDER_TO_MOVE_TO }}</h1>
     </div>
 
     <div class="modal-body">
@@ -12,7 +12,7 @@ <h1 class="dialog-title">Pick a folder</h1>
     </div>
 
     <div class="modal-footer">
-        <button class="dialog-button btn primary" data-button-id="ok">OK</button>
-        <button class="dialog-button btn" data-button-id="cancel">Cancel</button>
+        <button class="dialog-button btn primary" data-button-id="ok">{{ OK }}</button>
+        <button class="dialog-button btn" data-button-id="cancel">{{ CANCEL }}</button>
     </div>
 </div>
diff --git a/src/extensions/default/bramble-move-file/main.js b/src/extensions/default/bramble-move-file/main.js
@@ -8,11 +8,12 @@ define(function (require, exports, module) {
     var Commands       = brackets.getModule("command/Commands");
     var Menus          = brackets.getModule("command/Menus");
     var ExtensionUtils = brackets.getModule("utils/ExtensionUtils");
+    var Strings        = brackets.getModule("strings");
     var MoveToDialog   = require("MoveToDialog");
 
     var MOVE_FILE = "bramble-move-file.moveFile";
 
-    CommandManager.register("Move To...", MOVE_FILE, MoveToDialog.open);
+    CommandManager.register(Strings.CMD_MOVE_FILE, MOVE_FILE, MoveToDialog.open);
     var menu = Menus.getContextMenu(Menus.ContextMenuIds.PROJECT_MENU);
     menu.addMenuItem(MOVE_FILE, null, Menus.AFTER, Commands.FILE_RENAME);