Merge pull request #1708 from paulvanbrenk/improveLocalization

Improve localization

Author: paulvanbrenk

Nodejs/Product/InteractiveWindow/Repl/Commands/CancelExecutionCommand.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.ComponentModel.Composition;
 using System.Reflection;
@@ -21,7 +21,7 @@ public Task<ExecutionResult> Execute(IReplWindow window, string arguments)
 
         public string Description
         {
-            get { return "Stops execution of the current command."; }
+            get { return Resources.CancelDescription; }
         }
 
         public string Command

Nodejs/Product/InteractiveWindow/Repl/Commands/ClearScreenReplCommand.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.ComponentModel.Composition;
 using System.Reflection;
@@ -21,7 +21,7 @@ public Task<ExecutionResult> Execute(IReplWindow window, string arguments)
 
         public string Description
         {
-            get { return "Clears the contents of the REPL editor window"; }
+            get { return Resources.ClearDescription; }
         }
 
         public string Command

Nodejs/Product/InteractiveWindow/Repl/Commands/EchoReplCommand.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
@@ -15,7 +15,7 @@ public Task<ExecutionResult> Execute(IReplWindow window, string arguments)
             if (string.IsNullOrWhiteSpace(arguments))
             {
                 var curValue = (bool)window.GetOptionValue(ReplOptions.ShowOutput);
-                window.WriteLine("ECHO is " + (curValue ? "ON" : "OFF"));
+                window.WriteLine(string.Format(Resources.EchoState, curValue ? "\'ON\'" : "\'OFF\'"));
                 return ExecutionResult.Succeeded;
             }
 
@@ -38,7 +38,7 @@ public Task<ExecutionResult> Execute(IReplWindow window, string arguments)
 
         public string Description
         {
-            get { return "Suppress or unsuppress output to the buffer"; }
+            get { return Resources.EchoDescription; }
         }
 
         public string Command

Nodejs/Product/InteractiveWindow/Repl/Commands/ResetReplCommand.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.ComponentModel.Composition;
 using System.Reflection;
@@ -21,7 +21,7 @@ public Task<ExecutionResult> Execute(IReplWindow window, string arguments)
 
         public string Description
         {
-            get { return "Reset to an empty execution engine, but keep REPL history"; }
+            get { return Resources.ResetDescription; }
         }
 
         public string Command

Nodejs/Product/InteractiveWindow/Repl/Commands/WaitReplCommand.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
 using System.ComponentModel.Composition;
@@ -31,7 +31,7 @@ public Task<ExecutionResult> Execute(IReplWindow window, string arguments)
 
         public string Description
         {
-            get { return "Wait for at least the specified number of milliseconds"; }
+            get { return Resources.WaitDescription; }
         }
 
         public string Command

Nodejs/Product/InteractiveWindow/Repl/ReplOutputClassificationFormatDefinitions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.ComponentModel.Composition;
 using System.Windows.Media;
@@ -23,7 +23,7 @@ internal class InteractiveErrorFormatDefinition : ClassificationFormatDefinition
 
         public InteractiveErrorFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationError;
             ForegroundColor = Color.FromRgb(0xee, 00, 00);
         }
     }
@@ -43,7 +43,7 @@ internal class InteractiveBlackFormatDefinition : ClassificationFormatDefinition
 
         public InteractiveBlackFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationBlack;
             ForegroundColor = Colors.Black;
         }
     }
@@ -63,7 +63,7 @@ internal class InteractiveDarkRedFormatDefinition : ClassificationFormatDefiniti
 
         public InteractiveDarkRedFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationDarkRed;
             ForegroundColor = Color.FromRgb(0xd4, 0, 0);
         }
     }
@@ -83,7 +83,7 @@ internal class InteractiveDarkGreenFormatDefinition : ClassificationFormatDefini
 
         public InteractiveDarkGreenFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationDarkGreen;
             ForegroundColor = Color.FromRgb(0x00, 0x8a, 0);
         }
     }
@@ -103,7 +103,7 @@ internal class InteractiveDarkYellowFormatDefinition : ClassificationFormatDefin
 
         public InteractiveDarkYellowFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationDarkYellow;
             ForegroundColor = Color.FromRgb(0x98, 0x70, 0);
         }
     }
@@ -123,7 +123,7 @@ internal class InteractiveDarkBlueFormatDefinition : ClassificationFormatDefinit
 
         public InteractiveDarkBlueFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationDarkBlue;
             ForegroundColor = Color.FromRgb(0x00, 0x57, 0xff);
         }
     }
@@ -143,7 +143,7 @@ internal class InteractiveDarkMagentaFormatDefinition : ClassificationFormatDefi
 
         public InteractiveDarkMagentaFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationDarkMagenta;
             ForegroundColor = Color.FromRgb(0xbb, 0x00, 0xbb);
         }
     }
@@ -163,7 +163,7 @@ internal class InteractiveDarkCyanFormatDefinition : ClassificationFormatDefinit
 
         public InteractiveDarkCyanFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationDarkCyan;
             ForegroundColor = Color.FromRgb(0x00, 0x7f, 0x7f);
         }
     }
@@ -182,7 +182,7 @@ internal class InteractiveGrayFormatDefinition : ClassificationFormatDefinition
         internal static ClassificationTypeDefinition Definition = null; // Set via MEF
         public InteractiveGrayFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationGray;
             ForegroundColor = Color.FromRgb(0x76, 0x76, 0x76);
         }
     }
@@ -202,7 +202,7 @@ internal class InteractiveDarkGrayFormatDefinition : ClassificationFormatDefinit
 
         public InteractiveDarkGrayFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationDarkGray;
             ForegroundColor = Color.FromRgb(0x69, 0x69, 0x69);
         }
     }
@@ -222,7 +222,7 @@ internal class InteractiveRedFormatDefinition : ClassificationFormatDefinition
 
         public InteractiveRedFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationRed;
             ForegroundColor = Color.FromRgb(0xEE, 0, 0);
         }
     }
@@ -242,7 +242,7 @@ internal class InteractiveGreenFormatDefinition : ClassificationFormatDefinition
 
         public InteractiveGreenFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationGreen;
             ForegroundColor = Color.FromRgb(0x00, 0x80, 0);
         }
     }
@@ -262,7 +262,7 @@ internal class InteractiveYellowFormatDefinition : ClassificationFormatDefinitio
 
         public InteractiveYellowFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationYellow;
             ForegroundColor = Color.FromRgb(0xff, 0xff, 0);
         }
     }
@@ -283,7 +283,7 @@ internal class InteractiveBlueFormatDefinition : ClassificationFormatDefinition
 
         public InteractiveBlueFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationBlue;
             ForegroundColor = Color.FromRgb(0x00, 0x00, 0xff);
         }
     }
@@ -303,7 +303,7 @@ internal class InteractiveMagentaFormatDefinition : ClassificationFormatDefiniti
 
         public InteractiveMagentaFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationMagenta;
             ForegroundColor = Color.FromRgb(0xd1, 0x00, 0xd1);
         }
     }
@@ -323,7 +323,7 @@ internal class InteractiveCyanFormatDefinition : ClassificationFormatDefinition
 
         public InteractiveCyanFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationCyan;
             ForegroundColor = Color.FromRgb(0x00, 0xff, 0xff);
         }
     }
@@ -343,7 +343,7 @@ internal class InteractiveWhiteFormatDefinition : ClassificationFormatDefinition
 
         public InteractiveWhiteFormatDefinition()
         {
-            DisplayName = Name;
+            DisplayName = Resources.ClassificationWhite;
             ForegroundColor = Color.FromRgb(0xff, 0xff, 0xff);
         }
     }

Nodejs/Product/InteractiveWindow/Repl/ReplWindow.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
@@ -2786,7 +2786,7 @@ private Task<ExecutionResult> ExecuteCommand(string text, bool updateHistory)
             }
             catch (Exception e)
             {
-                WriteError(string.Format("Command '{0}' failed: {1}", command, e.Message));
+                WriteError(string.Format(Resources.ReplCommandFailed, command, e.Message));
                 return ExecutionResult.Failed;
             }
         }
@@ -2797,7 +2797,7 @@ private void ShowReplHelp()
             cmdnames.Sort((x, y) => StringComparer.CurrentCulture.Compare(x.Command, y.Command));
 
             const string helpFmt = "  {0,-24}  {1}";
-            WriteLine(string.Format(helpFmt, _commandPrefix + "help", "Show a list of REPL commands"));
+            WriteLine(string.Format(helpFmt, _commandPrefix + "help", Resources.HelpDescription));
 
             foreach (var cmd in cmdnames)
             {