Merge pull request #1676 from adobe/jasonsanjose/trademark

Add app title to about menu item label. Fix JSLint indent errors.
adobe · Sep 18, 2012 · f262bd4 · f262bd4
2 parents a1fe02b + 8c97e3c
commit f262bd4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js
@@ -137,9 +137,9 @@ define({
      * Keyboard modifier names
      */
 
-     "KEYBOARD_CTRL"   : "Strg",
-     "KEYBOARD_SHIFT"  : "Umschalt",
-     "KEYBOARD_SPACE"  : "Leer",
+    "KEYBOARD_CTRL"   : "Strg",
+    "KEYBOARD_SHIFT"  : "Umschalt",
+    "KEYBOARD_SPACE"  : "Leer",
 
     /**
      * Command Name Constants
@@ -207,7 +207,7 @@ define({
 
     // Help menu commands
     "HELP_MENU"                           : "Hilfe",
-    "CMD_ABOUT"                           : "Über",
+    "CMD_ABOUT"                           : "Über {APP_TITLE}",
     "CMD_FORUM"                           : "{APP_NAME}-Forum",
 
     // Special commands invoked by the native shell

diff --git a/src/nls/es/strings.js b/src/nls/es/strings.js
@@ -191,7 +191,7 @@ define({
 
     // Help menu commands
     "HELP_MENU"                           : "Ayuda",
-    "CMD_ABOUT"                           : "Acerca de...",
+    "CMD_ABOUT"                           : "Acerca de {APP_TITLE}",
     "CMD_FORUM"                           : "Foro de {APP_NAME}",
 
     // Special commands invoked by the native shell

diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js
@@ -199,7 +199,7 @@ define({
 
     // Help menu commands
 	"HELP_MENU": "Aide",
-	"CMD_ABOUT": "A propos",
+	"CMD_ABOUT": "Á propos de {APP_TITLE}",
 	"CMD_FORUM": "Forum {APP_NAME}",
 
     // Special commands invoked by the native shell

diff --git a/src/nls/nb/strings.js b/src/nls/nb/strings.js
@@ -129,9 +129,9 @@ define({
      * Keyboard modifier names
      */
 
-     "KEYBOARD_CTRL"   : "Ctrl",
-     "KEYBOARD_SHIFT"  : "Shift",
-     "KEYBOARD_SPACE"  : "Space",
+    "KEYBOARD_CTRL"   : "Ctrl",
+    "KEYBOARD_SHIFT"  : "Shift",
+    "KEYBOARD_SPACE"  : "Space",
 
     /**
      * Command Name Constants
@@ -199,7 +199,7 @@ define({
 
     // Help menu commands
     "HELP_MENU" : "Hjelp",
-    "CMD_ABOUT" : "Om",
+    "CMD_ABOUT" : "Om {APP_TITLE}",
     "CMD_FORUM" : "{APP_NAME} forum",
 
     // Special commands invoked by the native shell

diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
@@ -129,9 +129,9 @@ define({
      * Keyboard modifier names
      */
 
-     "KEYBOARD_CTRL"   : "Ctrl",
-     "KEYBOARD_SHIFT"  : "Shift",
-     "KEYBOARD_SPACE"  : "Space",
+    "KEYBOARD_CTRL"   : "Ctrl",
+    "KEYBOARD_SHIFT"  : "Shift",
+    "KEYBOARD_SPACE"  : "Space",
 
     /**
      * Command Name Constants
@@ -199,7 +199,7 @@ define({
 
     // Help menu commands
     "HELP_MENU"                           : "Help",
-    "CMD_ABOUT"                           : "About",
+    "CMD_ABOUT"                           : "About {APP_TITLE}",
     "CMD_FORUM"                           : "{APP_NAME} Forum",
 
     // Special commands invoked by the native shell

diff --git a/src/strings.js b/src/strings.js
@@ -38,10 +38,12 @@ define(function (require, exports, module) {
         StringUtils = require("utils/StringUtils");
 
     strings.APP_NAME = brackets.metadata.name || strings.APP_NAME;
+    strings.APP_TITLE = brackets.config.app_title || strings.APP_NAME;
 
     // Convert {APP_NAME}
     Object.keys(strings).forEach(function (key) {
         strings[key] = strings[key].replace(/\{APP_NAME\}/g, strings.APP_NAME);
+        strings[key] = strings[key].replace(/\{APP_TITLE\}/g, strings.APP_TITLE);
     });
 
     module.exports = strings;