Fixing "TouchDevelop" text and adding loc hooks

Author: millerv

Diff for: CONTRIBUTING.md

@@ -2,13 +2,13 @@
 
 # Contributing
 
-TouchDevelop is currently accepting contributions in the form of bug fixes, features or design changes.
+Touch Develop is currently accepting contributions in the form of bug fixes, features or design changes.
 
 ## Contributing bug fixes
-A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the TouchDevelop team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the issue clearly stating that you've submitted a PR request, to avoid anyone else doing the same.
+A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the Touch Develop team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the issue clearly stating that you've submitted a PR request, to avoid anyone else doing the same.
 
 ## Contributing features or design changes
-Features or design changes (things that add new or improved functionality to TouchDevelop) may be accepted, but will need to first be approved (marked as "Milestone == Community" by a TouchDevelop coordinator with the message "Approved") in the suggestion issue.
+Features or design changes (things that add new or improved functionality to Touch Develop) may be accepted, but will need to first be approved (marked as "Milestone == Community" by a Touch Develop coordinator with the message "Approved") in the suggestion issue.
 
 ## Legal
 

Diff for: Jakefile

@@ -382,7 +382,7 @@ task('log', [], { async: false }, function () {
 
 // Our targets are the concatenated files, which are the final result of the
 // compilation. We also re-run the CSS prefixes thingy everytime.
-desc('build the whole TouchDevelop project')
+desc('build the whole Touch Develop project')
 task('default', [
   'css-prefixes',
   'build/client.js',

Diff for: ast/ast.ts

@@ -2649,7 +2649,7 @@ module TDev.AST {
             { cap: PlatformCapability.Tiles,          id: "tiles",          name: lf("Tiles") },
             { cap: PlatformCapability.Npm,            id: "npm",            name: lf("Node Package Manager") },
             { cap: PlatformCapability.Cordova,        id: "cordova",        name: lf("Cordova Plugin Manager") },
-            { cap: PlatformCapability.Shell,          id: "shell",          name: lf("TouchDevelop Local Shell") },
+            { cap: PlatformCapability.Shell,          id: "shell",          name: lf("Touch Develop Local Shell") },
         ];
 
         static capabilityName(p:PlatformCapability)

Diff for: ast/diff.ts

@@ -1409,7 +1409,7 @@ module TDev.AST.Diff {
         var allowedStrings:any = {};
 
         ([
-        "TouchDevelop is cool!", "tap to create bubbles", "hello", "hello world", "hello world!"
+        "Touch Develop is cool!", "tap to create bubbles", "hello", "hello world", "hello world!"
         ]).forEach(s => {
             allowedStrings[quote(s)] = 1
         })

Diff for: ast/help.ts

@@ -422,7 +422,7 @@ module TDev {
         }, {
             id: "videoptr",
             name: "TouchDevelop Video",
-            description: lf("TouchDevelop video (/td/videos/...)"),
+            description: lf("Touch Develop video (/td/videos/...)"),
             parseIds: (text, ismeta)  => {
                 var pref = Cloud.getServiceUrl().replace(/(test|stage|live)/, "www")
                 var m = /^(https:\/\/[^\/]+)\/(\S+)/.exec(text) 
@@ -2372,7 +2372,7 @@ module TDev {
                 w.document.write(html);
                 w.document.close();
             } catch(e) {
-                ModalDialog.info(":( can't print from here", "Your browser might have blocked the print page or try to print from another device...");
+                ModalDialog.info(":( can't print from here", lf("Your browser might have blocked the print page or try to print from another device..."));
             }
         }
 

Diff for: editor/collab.ts

@@ -481,13 +481,13 @@ module TDev {
                 var s = AstSession;
                 AstSession.log("discard cache because it is marooned");
                 Script.editorState.collabSessionId = undefined;
-                ModalDialog.infoAsync("Project Discontinued", "This project has been discontinued. You can continue to edit the script, but it will no longer synchronize with other team members.")
+                ModalDialog.infoAsync("Project Discontinued", lf("This project has been discontinued. You can continue to edit the script, but it will no longer synchronize with other team members."))
                     .thenalways(() => TDev.TheEditor.goToHubAsync()).done();
                 astSessionSlot.disconnect(true, "project discontinued"); // deletes the file from disk
             }
             else if (AstSession.faulted) {
                 AstSession.log("local cache is corrupted - deleting");
-                ModalDialog.infoAsync("Cache Corrupted", "Sorry... we encountered a problem with the stored project state. Please try again to get the latest state from the server.")
+                ModalDialog.infoAsync("Cache Corrupted", lf("Sorry... we encountered a problem with the stored project state. Please try again to get the latest state from the server."))
                     .thenalways(() => TDev.TheEditor.goToHubAsync()).done();
                 return astSessionSlot.disconnect(true, "cache corrupted"); // deletes the file from disk
             }

Diff for: editor/default.ts

@@ -57,7 +57,7 @@ module TDev
             if (!upd && window.localStorage["appUpdated"]) {
                 window.localStorage.removeItem("appUpdated");
                 if (dbg)
-                    upd = div("app-updated", lf("The TouchDevelop app has been updated."));
+                    upd = div("app-updated", lf("The Touch Develop app has been updated."));
             }
 
             if (upd) {
@@ -424,8 +424,7 @@ module TDev
             if (updateCnt >= 30) {
                 ProgressOverlay.hide()
                 window.localStorage["lastForcedUpdate"] = Date.now()
-                ModalDialog.info("couldn't connect to cloud services",
-                                 msg + " failed; we are now using offline mode; make sure your internet connection working")
+                ModalDialog.info("couldn't connect to cloud services",lf("{0} failed; we are now using offline mode;\n make sure your internet connection is working",msg))
             } else {
                 Util.setTimeout(1000, checkUpdate)
             }

Diff for: editor/editor.ts

@@ -632,8 +632,8 @@ module TDev
                     TheEditor.goToLocation(loc)
                 } else {
                     var m = ModalDialog.info("error in library",
-                      "it appears that the error is in fact in a library. " +
-                      "you need to locate the relevant library reference and tap on [edit library].")
+                      lf("it appears that the error is in fact in a library. ") +
+                      lf("you need to locate the relevant library reference and tap on [edit library]."))
                     m.addHTML("<b>message:</b> " + Util.formatText(error))
                     loc = new CodeLocation(<AST.Decl>Script.libraries()[0]||Script)
                     TheEditor.goToLocation(loc)
@@ -1703,7 +1703,7 @@ module TDev
             var missing = this.currentRt.compiled.missingApis;
             if (!this.complainedAboutMissingAPIs && missing.length > 0) {
                 ProgressOverlay.hide();
-                ModalDialog.ask("the following APIs are not implemented on the current device: " +
+                ModalDialog.ask(lf("the following APIs are not implemented on the current device: ") +
                                 missing.join(", "),
                                 lf("run anyway"),
                                 () => {
@@ -4222,8 +4222,8 @@ module TDev
             var progressBar = HTML.mkProgressBar();
             progressDialog.add(progressBar);
             progressDialog.add(div("wall-dialog-header", div("", lf("signing out"))));
-            progressDialog.add(div("wall-dialog-body", div('', "cleaning up browser data...")));
-            progressDialog.add(div("wall-dialog-body", div('', "(please wait, it can take up to a minute)")));
+            progressDialog.add(div("wall-dialog-body", div('', lf("cleaning up browser data..."))));
+            progressDialog.add(div("wall-dialog-body", div('', lf("(please wait, it can take up to a minute)"))));
             progressDialog.show();
             progressBar.start();
 
@@ -4278,7 +4278,7 @@ module TDev
             var progressBar = HTML.mkProgressBar();
             progressDialog.add(progressBar);
             progressDialog.add(div("wall-dialog-header", div("", lf("sign out"))));
-            progressDialog.add(div("wall-dialog-body", div('', "checking status...")));
+            progressDialog.add(div("wall-dialog-body", div('', lf("checking status..."))));
             progressDialog.show();
             progressBar.start();
 
@@ -4322,40 +4322,42 @@ module TDev
             return window.localStorage["always_beta"] === "yes";
         }
 
-        public popupMenu()
-        {
-            var m = new ModalDialog();
-            m.addClass("accountSettings")
-            var betaDiv = null
-
-            var relId = (<any>window).betaFriendlyId;
-            if (!relId) relId = "(local)";
-            var mtch = /-(\d+)\//.exec(Ticker.mainJsName)
-            if (mtch) relId = "v" + mtch[1];
-
-            betaDiv = div("wall-dialog-body",
-                Editor.mkHelpLink("beta"),
-                HTML.mkCheckBox(
-                    lf("always use beta version of TouchDevelop"),
-                    Editor.setAlwaysBeta, Editor.isAlwaysBeta()),
-                div("clear"));
-            if (World.switchToChannel) {
-                if ((<any>window).betaFriendlyId) {
-                    betaDiv.appendChild(HTML.mkButton(
-                        lf("stop beta testing"),
-                        () => {
-                            Editor.setAlwaysBeta(false);
-                            World.switchToChannel("current");
-                            m.dismiss();
-                        }))
-                } else {
-                    betaDiv.appendChild(HTML.mkButton(lf("start beta testing"),
-                    () => {
-                        World.switchToChannel("beta");
-                        m.dismiss();
-                    }))
-                }
-            }
+        public popupMenu() 
+        { 
+           var m = new ModalDialog(); 
+            m.addClass("accountSettings") 
+            var betaDiv = null 
+ 
+ 
+            var relId = (<any>window).betaFriendlyId; 
+            if (!relId) relId = "(local)"; 
+            var mtch = /-(\d+)\//.exec(Ticker.mainJsName) 
+            if (mtch) relId = "v" + mtch[1]; 
+
+ 
+            betaDiv = div("wall-dialog-body", 
+                Editor.mkHelpLink("beta"), 
+                HTML.mkCheckBox( 
+                    lf("always use beta version of TouchDevelop"), 
+                    Editor.setAlwaysBeta, Editor.isAlwaysBeta()), 
+                div("clear")); 
+            if (World.switchToChannel) { 
+               if ((<any>window).betaFriendlyId) { 
+                    betaDiv.appendChild(HTML.mkButton( 
+                        lf("stop beta testing"), 
+                        () => { 
+                            Editor.setAlwaysBeta(false); 
+                            World.switchToChannel("current"); 
+                            m.dismiss(); 
+                        })) 
+                } else { 
+                    betaDiv.appendChild(HTML.mkButton(lf("start beta testing"), 
+                    () => { 
+                        World.switchToChannel("beta"); 
+                        m.dismiss(); 
+                    })) 
+                } 
+            } 
 
             var zoomSlide = HTML.mkTextInput("range", lf("zoom factor"));
             zoomSlide.className = "colorSlider";
@@ -4372,7 +4374,7 @@ module TDev
 
 
             m.add([
-                div("wall-dialog-header", lf("TouchDevelop settings")),
+                div("wall-dialog-header", lf("Touch Develop settings")),
                 div("wall-dialog-body", HTML.mkCheckBox(lf("access and use your location"),
                     (v) => RuntimeSettings.setLocation(v), RuntimeSettings.location())),
                 div("wall-dialog-body", HTML.mkCheckBox(lf("play sounds and music"),
@@ -4389,7 +4391,7 @@ module TDev
             if (TDev.dbg) {
                 var chaosOfflineEdit = HTML.mkCheckBox(lf("chaos offline mode"), (v) => Cloud.setChaosOffline(v), Cloud.isChaosOffline());
                 m.add([
-                    div("wall-dialog-body", "under the hood (dbg): ",
+                    div("wall-dialog-body", lf("under the hood (dbg): "),
                         HTML.mkButton(lf("throw"), () => {
                             throw new Error("fake error, " + Util.guidGen())
                         })),
@@ -4412,7 +4414,7 @@ module TDev
                                 HTML.mkButton(lf("save offline caches"), () =>
                                     LocalProxy.saveCachesAsync().done())
                             ),
-                        div("wall-dialog-body", HTML.mkCheckBox("enable new intelli prediction",
+                        div("wall-dialog-body", HTML.mkCheckBox(lf("enable new intelli prediction"),
                             (v) => { TheEditor.calculator.enableNewPredictor = v; }, TheEditor.calculator.enableNewPredictor)),
                         (Util.localTranslationTracking ? HTML.mkButtonTick(lf("translations"), Ticks.hubShowcaseMgmt, () => { ModalDialog.showText(Util.dumpTranslationFreqs()) }) : null),
                         (dbg ? HTML.mkButton(lf("show internal icons"), () => { ScriptProperties.showIcons(); }) : null),

Diff for: editor/hub.ts

@@ -724,7 +724,7 @@ module TDev.Browser {
                             lf("Number of codes: "), count,
                             lf("Credit for each code: "), credit,
                             lf("Number of uses for each code: "), numuses,
-                            lf("Code description (purpouse): "), desc,
+                            lf("Code description (purpose): "), desc,
                             lf("Groups to join: "), groups,
                             HTML.mkAsyncButton(lf("generate"), () => {
                                 var data = {
@@ -1717,7 +1717,7 @@ module TDev.Browser {
             TipManager.update();
             if (h[1] == "logout") {
                 // we may be hosed enough that ModalDialog.ask doesn't work anymore
-                if (window.confirm("Do you really want to sign out?\nAll your script data and any unsynchronized script changes will be lost.") == true) {
+                if (window.confirm(lf("Do you really want to sign out?\nAll your script data and any unsynchronized script changes will be lost.")) == true) {
                     TheEditor.logoutAsync(false).done();
                     return;
                 }
@@ -2436,8 +2436,8 @@ module TDev.Browser {
                 this.showingTemporarySignin = true;
                 var d = new ModalDialog();
                 d.add(div('wall-dialog-header', lf("Sign in to avoid losing your scripts!")));
-                d.add(div('wall-dialog-body', lf("Your browser does not allow TouchDevelop to store web site data. This usually happens if run in Private Mode (Safari), in InPrivate mode (Internet Explorer) or your security settings prevent data storage.")));
-                d.add(div('wall-dialog-body', lf("When you sign in, TouchDevelop will save your scripts in the cloud.")));
+                d.add(div('wall-dialog-body', lf("Your browser does not allow Touch Develop to store web site data. This usually happens if run in Private Mode (Safari), in InPrivate mode (Internet Explorer) or your security settings prevent data storage.")));
+                d.add(div('wall-dialog-body', lf("When you sign in, Touch Develop will save your scripts in the cloud.")));
                 d.add(div("wall-dialog-buttons",
                     HTML.mkButton(lf("skip this"), () => {
                         this.showingTemporarySignin = false;
@@ -2608,7 +2608,7 @@ module TDev.Browser {
                     yearofbirth = <HTMLSelectElement>textEntry(lf("year of birth"), HTML.mkComboBox([HTML.mkOption("0", "")].concat(settings.yearofbirthoptions.map(year => HTML.mkOption(year + "", year + "", settings.yearofbirth == year)))));
 
                     howfound = <HTMLSelectElement>textEntry(lf("how found"), HTML.mkComboBox([HTML.mkOption("", "")].concat(settings.howfoundoptions.map(s => HTML.mkOption(s, s, settings.howfound == s)))),
-                        lf("How did you discover TouchDevelop?"));
+                        lf("How did you discover Touch Develop?"));
 
                     programmingknowledge = <HTMLSelectElement>textEntry(lf("programming knowledge"), HTML.mkComboBox([HTML.mkOption("", "")].concat(settings.programmingknowledgeoptions.map(s => HTML.mkOption(s, s, settings.programmingknowledge == s)))),
                         lf("What is your level of programming knowledge?"));
@@ -2617,7 +2617,7 @@ module TDev.Browser {
                         lf("What is your occupation?"));
 
                     school = <HTMLInputElement>textEntry(lf("school"), HTML.mkTextInput("text", lf("school")),
-                        lf("Enter your school affiliation if any."));
+                        lf("Enter your school affiliation, if any."));
                 }
 
                 dialogBody.appendChild(div("form-title", lf("email and push notifications")));
@@ -2637,7 +2637,7 @@ module TDev.Browser {
                 var t = settings.emailnewsletter2;
                 if (notificationsOnly && !t) t = "yes";
                 emailnewsletter = <HTMLSelectElement>textEntry(lf("receive email newsletters"), HTML.mkComboBox([HTML.mkOption("", "")].concat(settings.emailnewsletter2options.map(s => HTML.mkOption(s, s, t == s)))),
-                    lf("Do you want to receive informational TouchDevelop-related newsletters, e.g. about new features and upcoming events?"));
+                    lf("Do you want to receive informational Touch Develop-related newsletters, e.g. about new features and upcoming events?"));
                 emailnewsletterDiv = lastDiv;
 
                 var u = settings.emailfrequency;
@@ -2659,7 +2659,7 @@ module TDev.Browser {
                     emailfrequencyDiv.style.display = "none";
                     if (pushNotificationsDiv) pushNotificationsDiv.style.display = "none";
                     var summary = div("formHint",
-                        t == "yes" ? lf("You will get TouchDevelop newsletters.") : lf("You will not get TouchDevelop newsletters."),
+                        t == "yes" ? lf("You will get Touch Develop newsletters.") : lf("You will not get Touch Develop newsletters."),
                         "You will get a ", span("emph", u), " email notification digest ", pushNotifications  ? <any[]>["and ", span("emph", v == "yes" ? "mobile" : "no"), " push notifications"] : [], " when users engage with your publications or posts. ",
                         span("emph", lf("Change settings...")));
                     summary.onclick = () => {

Diff for: editor/libraryExtractor.ts

@@ -148,11 +148,11 @@ module TDev
 
             if (theRest.length > 0) {
                 m.add(
-                    div("wall-dialog-header", "moving",
+                    div("wall-dialog-header", lf("moving"),
                         DeclRender.mkBox(toMove.decl),
-                        "to library",
+                        lf("to library"),
                         DeclRender.mkBox(this.split.getLib()),
-                        "requires moving",
+                        lf("requires moving"),
                         theRest.map(dd => DeclRender.mkBox(dd.decl))
                         )
                     );
@@ -241,7 +241,7 @@ module TDev
                 if (tc.length > 10) {
                     var more = tc.length - 10;
                     // TODO: make a button to expose the rest of the list
-                    rest.push(div("smallDecl", "load (" + more.toString() + " more)"));
+                    rest.push(div("smallDecl", lf("load ({0} more)", more.toString())));
                 }
                 rest.push(div("smallDecl", " "));
             }