Adding new flags for supported locales (#420)

* Adding new flags for supported locales
* Removing pl-PL locale code from tests
* Linting

app/client/lib/localization.ts

@@ -40,7 +40,13 @@ export async function setupLocale() {
       const resourceUrl = loadPath.replace('{{lng}}', lang.replace("-", "_")).replace('{{ns}}', n);
       const response = await fetch(resourceUrl);
       if (!response.ok) {
+        // Throw only if we don't have any fallbacks.
+        if (lang === i18next.options.fallbackLng && n === i18next.options.defaultNS) {
           throw new Error(`Failed to load ${resourceUrl}`);
+        } else {
+          console.warn(`Failed to load ${resourceUrl}`);
+          return;
+        }
       }
       i18next.addResourceBundle(lang, n, await response.json());
     }

app/common/Locales.ts

@@ -75,7 +75,12 @@ export function getCountryCode(locale: string) {
   if (locale === 'en') { return 'US'; }
   let countryCode = locale.split(/[-_]/)[1];
   if (countryCode) { return countryCode.toUpperCase(); }
-  countryCode = locale.toUpperCase();
+
+  // Some defaults that we support and can't be read from language code.
+  countryCode = {
+    'uk': 'UA', // Ukraine
+  }[locale] ?? locale.toUpperCase();
+
   // Test if we can use language as a country code.
   if (localeCodes.map(code => code.split(/[-_]/)[1]).includes(countryCode)) {
     return countryCode;

static/icons/locales/PL.svg

@@ -0,0 +1,15 @@
+
+<svg width="16" height="12" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <mask id="a" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="12">
+    <path fill="#fff" d="M0 0h16v12H0z"/>
+  </mask>
+  <g mask="url(#a)">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M0 0v12h16V0H0z" fill="#F7FCFF"/>
+    <mask id="b" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="12">
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M0 0v12h16V0H0z" fill="#fff"/>
+    </mask>
+    <g mask="url(#b)">
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M0 6v6h16V6H0z" fill="#C51918"/>
+    </g>
+  </g>
+</svg>

static/icons/locales/RU.svg

@@ -0,0 +1,16 @@
+
+<svg width="16" height="12" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <mask id="a" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="12">
+    <path fill="#fff" d="M0 0h16v12H0z"/>
+  </mask>
+  <g mask="url(#a)">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M0 0v12h16V0H0z" fill="#3D58DB"/>
+    <mask id="b" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="12">
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M0 0v12h16V0H0z" fill="#fff"/>
+    </mask>
+    <g mask="url(#b)" fill-rule="evenodd" clip-rule="evenodd">
+      <path d="M0 0v4h16V0H0z" fill="#F7FCFF"/>
+      <path d="M0 8v4h16V8H0z" fill="#C51918"/>
+    </g>
+  </g>
+</svg>

static/icons/locales/UA.svg

@@ -0,0 +1,14 @@
+<svg width="16" height="12" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <mask id="a" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="12">
+    <path fill="#fff" d="M0 0h16v12H0z"/>
+  </mask>
+  <g mask="url(#a)">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M0 0v12h16V0H0z" fill="#3195F9"/>
+    <mask id="b" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="12">
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M0 0v12h16V0H0z" fill="#fff"/>
+    </mask>
+    <g mask="url(#b)">
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M0 6v6h16V6H0z" fill="#FECA00"/>
+    </g>
+  </g>
+</svg>

test/nbrowser/Localization.ts

@@ -51,8 +51,8 @@ describe("Localization", function() {
     assert.deepEqual(gristConfig.namespaces.sort(), [...namespaces].sort());
   });
 
-  // Now make a Polish language file, and test that it is used.
+  // Now make a uz-UZ language file, and test that it is used.
-  describe("with Polish language file", function() {
+  describe("with uz-UZ language file", function() {
     let oldEnv: testUtils.EnvironmentSnapshot;
     let tempLocale: string;
     let existingLocales: string[];
@@ -65,7 +65,7 @@ describe("Localization", function() {
       oldEnv = new testUtils.EnvironmentSnapshot();
       // Add another language to the list of supported languages.
       tempLocale = makeCopy();
-      createLanguage(tempLocale, "pl");
+      createLanguage(tempLocale, "uz");
       process.env.GRIST_LOCALES_DIR = tempLocale;
       await server.restart();
     });
@@ -79,7 +79,7 @@ describe("Localization", function() {
       const homeUrl = `${server.getHost()}/o/docs`;
       // Read response from server, and check that it contains the correct language.
       const enResponse = await (await fetch(homeUrl)).text();
-      const plResponse = await (await fetch(homeUrl, {headers: {"Accept-Language": "pl-PL,pl;q=1"}})).text();
+      const uzResponse = await (await fetch(homeUrl, {headers: {"Accept-Language": "uz-UZ,uz;q=1"}})).text();
       const ptResponse = await (await fetch(homeUrl, {headers: {"Accept-Language": "pt-PR,pt;q=1"}})).text();
 
       function present(response: string, ...langs: string[]) {
@@ -96,19 +96,19 @@ describe("Localization", function() {
 
       // English locale is preloaded always.
       present(enResponse, "en");
-      present(plResponse, "en");
+      present(uzResponse, "en");
       present(ptResponse, "en");
 
       // Other locales are not preloaded for English.
-      notPresent(enResponse, "pl", "pl-PL", "en-US");
+      notPresent(enResponse, "uz", "un-UZ", "en-US");
 
-      // For Polish we have additional pl locale.
+      // For uz-UZ we have additional uz locale.
-      present(plResponse, "pl");
+      present(uzResponse, "uz");
-      // But only pl code is preloaded.
+      // But only uz code is preloaded.
-      notPresent(plResponse, "pl-PL");
+      notPresent(uzResponse, "uz-UZ");
 
       // For Portuguese we have only en.
-      notPresent(ptResponse, "pt", "pt-PR", "pl", "en-US");
+      notPresent(ptResponse, "pt", "pt-PR", "uz", "en-US");
     });
 
     it("loads correct languages from file system", async function() {
@@ -116,7 +116,7 @@ describe("Localization", function() {
       await driver.navigate().refresh();
       assert.equal(await driver.findWait('.test-welcome-title', 3000).getText(), 'TestMessage');
       const gristConfig: any = await driver.executeScript("return window.gristConfig");
-      assert.sameDeepMembers(gristConfig.supportedLngs, [...existingLocales, 'pl']);
+      assert.sameDeepMembers(gristConfig.supportedLngs, [...existingLocales, 'uz']);
     });
   });