Merge pull request #7333 from adobe/zaggino/uk-language

ingorichter · ingorichter · commit 84060d7cef60 · 2014-04-01T16:32:42.000-07:00
Define English (UK) language to use for differences between US and UK
diff --git a/src/nls/en-uk/strings.js b/src/nls/en-uk/strings.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global define */
+
+define({
+
+});
diff --git a/src/nls/root/strings-app.js b/src/nls/root/strings-app.js
@@ -33,6 +33,7 @@ define({
     "LOCALE_DE"                                 : "Deutsch",
     "LOCALE_EL"                                 : "Ελληνικά",
     "LOCALE_EN"                                 : "English",
+    "LOCALE_EN_UK"                              : "English (UK)",
     "LOCALE_ES"                                 : "Español",
     "LOCALE_FI"                                 : "suomi",
     "LOCALE_FR"                                 : "Français",
diff --git a/src/nls/strings.js b/src/nls/strings.js
@@ -40,6 +40,7 @@ define(function (require, exports, module) {
         "cs": true,
         "de": true,
         "el": true,
+        "en-uk": true,
         "es": true,
         "fa-ir": true,
         "fi": true,
