@adminforth/i18n 1.6.7 → 1.7.0

package/.woodpecker/buildSlackNotify.sh

@@ -1,10 +1,13 @@
 #!/bin/sh
 
+set -x
 
 COMMIT_SHORT_SHA=$(echo $CI_COMMIT_SHA | cut -c1-8)
 
+STATUS=${1}  
 
-if [ "$CI_STEP_STATUS" = "success" ]; then
+
+if [ "$STATUS" = "success" ]; then
   MESSAGE="Did a build without issues on \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\`. Commit: _${CI_COMMIT_MESSAGE}_ (<$CI_COMMIT_URL|$COMMIT_SHORT_SHA>)"
 
   curl  -s -X POST -H "Content-Type: application/json" -d '{
@@ -22,13 +25,14 @@ if [ "$CI_STEP_STATUS" = "success" ]; then
 fi
 export BUILD_LOG=$(cat ./build.log)
 
+BUILD_LOG=$(echo $BUILD_LOG | sed 's/"/\\"/g')
 
 MESSAGE="Broke \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\` with commit _${CI_COMMIT_MESSAGE}_ (<$CI_COMMIT_URL|$COMMIT_SHORT_SHA>)"
 CODE_BLOCK="\`\`\`$BUILD_LOG\n\`\`\`"
 
 echo "Sending slack message to developers $MESSAGE"
 # Send the message
-curl  -X POST -H "Content-Type: application/json" -d '{
+curl -sS -X POST -H "Content-Type: application/json" -d '{
   "username": "'"$CI_COMMIT_AUTHOR"'",
   "icon_url": "'"$CI_COMMIT_AUTHOR_AVATAR"'",
   "attachments": [
@@ -39,4 +43,4 @@ curl  -X POST -H "Content-Type: application/json" -d '{
         "pretext": "'"$MESSAGE"'"
     }
   ]
-}' "$DEVELOPERS_SLACK_WEBHOOK"
+}' "$DEVELOPERS_SLACK_WEBHOOK" 2>&1

package/.woodpecker/release.yml

@@ -16,28 +16,42 @@ steps:
     commands:
       - infisical export --domain https://vault.devforth.io/api --format=dotenv-export --env="prod" > /woodpecker/deploy.vault.env
 
-  release:
+  build:
     image: node:20
     when:
       - event: push
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     commands:
-      # install rsync
       - apt update && apt install -y rsync
-      - export $(cat /woodpecker/deploy.vault.env | xargs)
+      - . /woodpecker/deploy.vault.env   
       - npm clean-install
       - /bin/bash ./.woodpecker/buildRelease.sh
       - npm audit signatures
+
+  release:
+    image: node:20
+    when:
+      - event:
+          - push
+        branch:
+          - main
+    commands:
+      - . /woodpecker/deploy.vault.env
       - npx semantic-release
 
   slack-on-failure:
+    image: curlimages/curl
     when:
       - event: push
-        status: [failure, success]
-      - event: push
+        status: [failure]
+    commands:
+      - . /woodpecker/deploy.vault.env
+      - /bin/sh ./.woodpecker/buildSlackNotify.sh failure
+      
+  slack-on-success: 
     image: curlimages/curl
+    when:
+      - event: push
+        status: [success]
     commands:
-      - export $(cat /woodpecker/deploy.vault.env | xargs)
-      - /bin/sh ./.woodpecker/buildSlackNotify.sh
-
+      - . /woodpecker/deploy.vault.env
+      - /bin/sh ./.woodpecker/buildSlackNotify.sh success

package/dist/index.js

@@ -14,6 +14,7 @@ import path from 'path';
 import fs from 'fs-extra';
 import chokidar from 'chokidar';
 import { AsyncQueue } from '@sapphire/async-queue';
+import getFlagEmoji from 'country-flag-svg';
 const processFrontendMessagesQueue = new AsyncQueue();
 const SLAVIC_PLURAL_EXAMPLES = {
     uk: 'яблук | Яблуко | Яблука | Яблук', // zero | singular | 2-4 | 5+
@@ -788,14 +789,15 @@ export default class I18nPlugin extends AdminForthPlugin {
     }
     languagesList() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.options.supportedLanguages.map((lang) => {
+            return Promise.all(this.options.supportedLanguages.map((lang) => __awaiter(this, void 0, void 0, function* () {
                 return {
                     code: lang,
                     nameOnNative: iso6391.getNativeName(getPrimaryLanguageCode(lang)),
                     nameEnglish: iso6391.getName(getPrimaryLanguageCode(lang)),
                     emojiFlag: getCountryCodeFromLangCode(lang).toUpperCase().replace(/./g, char => String.fromCodePoint(char.charCodeAt(0) + 127397)),
+                    svgFlagB64: yield getFlagEmoji.default(getCountryCodeFromLangCode(lang)),
                 };
-            });
+            })));
         });
     }
     feedCategoryTranslations(messages, category) {

package/index.ts

@@ -7,6 +7,7 @@ import path from 'path';
 import fs from 'fs-extra';
 import chokidar from 'chokidar';
 import  { AsyncQueue } from '@sapphire/async-queue';
+import getFlagEmoji from 'country-flag-svg';
 
 
 const processFrontendMessagesQueue = new AsyncQueue();
@@ -922,15 +923,17 @@ export default class I18nPlugin extends AdminForthPlugin {
     nameOnNative: string;
     nameEnglish: string;
     emojiFlag: string;
+    svgFlagB64: string;
   }[]> {
-    return this.options.supportedLanguages.map((lang) => {
+    return Promise.all(this.options.supportedLanguages.map(async (lang) => {
       return {
         code: lang,
         nameOnNative: iso6391.getNativeName(getPrimaryLanguageCode(lang)),
         nameEnglish: iso6391.getName(getPrimaryLanguageCode(lang)),
         emojiFlag: getCountryCodeFromLangCode(lang).toUpperCase().replace(/./g, char => String.fromCodePoint(char.charCodeAt(0) + 127397)),
+        svgFlagB64: await (getFlagEmoji as any).default(getCountryCodeFromLangCode(lang)),
       };
-    });
+    }));
   }
 
   async feedCategoryTranslations(messages: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/i18n",
-  "version": "1.6.7",
+  "version": "1.7.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -31,6 +31,7 @@
     "@aws-sdk/client-ses": "^3.654.0",
     "@sapphire/async-queue": "^1.5.5",
     "chokidar": "^4.0.1",
+    "country-flag-svg": "^1.0.19",
     "fs-extra": "^11.3.2",
     "iso-3166": "^4.3.0",
     "iso-639-1": "^3.1.3"