Merge branch 'release/3.801.0'

VirtoCommerce · Jan 17, 2024 · 7051b80 · 7051b80
2 parents a442c6e + 850a63e
commit 7051b80
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 42 deletions.
diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml
@@ -1,4 +1,4 @@
-# v3.200.35
+# v3.200.36
 name: Module CI
 
 on:
@@ -202,18 +202,6 @@ jobs:
         with:
           packageUrl: ${{ steps.artifactUrl.outputs.download_url }}
 
-      - name: Update virtocommerce.com
-        if: ${{ github.ref == 'refs/heads/master' }}
-        uses: VirtoCommerce/vc-github-actions/update-virtocommercecom@master
-        with:
-          githubToken: ${{ secrets.REPO_TOKEN }}
-          login: ${{ secrets.VIRTOCOMMERCE_APP_ID }}
-          password: ${{ secrets.VIRTOCOMMERCE_SECRET }}
-          moduleId: ${{ steps.artifact_ver.outputs.moduleId }}
-          moduleDescription: ${{ steps.artifact_ver.outputs.moduleDescription }}
-          projectUrl: ${{ steps.artifact_ver.outputs.projectUrl }}
-          iconUrl: ${{ steps.artifact_ver.outputs.iconUrl }}
-
       - name: Parse Jira Keys from All Commits
         uses: VirtoCommerce/vc-github-actions/get-jira-keys@master
         if: always()
@@ -252,7 +240,7 @@ jobs:
     if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
         (github.event_name == 'workflow_dispatch')}}
     needs: 'ci'
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].35
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].36
     with:
       katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
       katalonRepoBranch: 'dev'
@@ -272,7 +260,7 @@ jobs:
         (github.ref == 'refs/heads/dev')) && 
         github.event_name == 'push' }}
     needs: ci
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].35
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].36
     with:
       releaseSource: module
       moduleId: ${{ needs.ci.outputs.moduleId }}

diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml
@@ -1,4 +1,4 @@
-# v3.200.35
+# v3.200.36
 name: Release hotfix
 
 on:
@@ -12,12 +12,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].35
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].36
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].35
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].36
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -45,7 +45,7 @@ jobs:
   publish-github-release:
     needs:
       [build, test, get-metadata]
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].35
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].36
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml
@@ -1,4 +1,4 @@
-# v3.200.35
+# v3.200.36
 name: Publish nuget
 
 on:
@@ -12,12 +12,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].35
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].36
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].35
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].36
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -28,7 +28,7 @@ jobs:
   publish-nuget:
     needs:
       [build, test]
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].35
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].36
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       forceGithub: false

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,11 +1,11 @@
-# v3.200.35
+# v3.200.36
 name: Release
 
 on:
   workflow_dispatch:
 
 jobs:
   release:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].35
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].36
     secrets:
       envPAT: ${{ secrets.REPO_TOKEN }}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.800.0</VersionPrefix>
+    <VersionPrefix>3.801.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.CoreModule.Core/Currency/Currency.cs b/src/VirtoCommerce.CoreModule.Core/Currency/Currency.cs
@@ -161,9 +161,10 @@ private void Initialize()
                     EnglishName = region.CurrencyEnglishName;
                 }
 
-                if (_code != null)
+                string symbol;
+                if (_code != null && _isoCurrencySymbolDict.TryGetValue(_code, out symbol) && symbol != null)
                 {
-                    Symbol = _isoCurrencySymbolDict[_code] ?? "N/A";
+                    Symbol = symbol;
                     NumberFormat.CurrencySymbol = Symbol;
                 }
             }

diff --git a/src/VirtoCommerce.CoreModule.Web/Localizations/de.VirtoCommerce.Core.json b/src/VirtoCommerce.CoreModule.Web/Localizations/de.VirtoCommerce.Core.json
@@ -77,20 +77,20 @@
                     "symbol": "Symbol",
                     "custom-formatting": "Benutzerdefinierte Formatierung"
                 },
-                "descriptions": {
-                    "code": "Der Währungscode. Verwenden Sie den 3-Buchstaben-ISO 4217-Code, falls vorhanden.",
-                    "name": "Der Name der Währung.",
-                    "is-primary": "Ist das die Hauptwährung? Nur eine Währung kann primär sein.",
-                    "exchange-rate": "Der Wechselkurs zur Primärwährung des Wechselkurses",
-                    "symbol": "Kurzes Währungssymbol",
-                    "custom-formatting": "Benutzerdefinierte Formatierung, die auf den Währungswert angewendet wird"
-                },
+              "descriptions": {
+                "code": "Der Währungscode. Verwenden Sie den 3-Buchstaben-ISO 4217-Code, falls vorhanden.",
+                "name": "Der Name der Währung.",
+                "is-primary": "Ist das die Hauptwährung? Nur eine Währung kann primär sein.",
+                "exchange-rate": "Der Wechselkurs zur Primärwährung des Wechselkurses",
+                "symbol": "Kurzes Währungssymbol",
+                "custom-formatting": "Kann jeder gültige Standardbezeichner für numerische Formate sein, z sowie jede Kombination von benutzerdefinierten numerischen Formatspezifizierern."
+              },
                 "placeholders": {
                     "symbol": "Ein eigenes Symbol eingeben oder leer lassen um entsprechenden Standard zu verwenden.",
                     "code": "Währungscode eingeben",
                     "name": "Geben Sie den Währungsnamen ein",
                     "exchange-rate": "Geben Sie den Wechselkurs gegenüber der Hauptwährung ein",
-                    "custom-formatting": "0,0.000"
+                    "custom-formatting": "Bitte geben Sie ein Format an oder lassen Sie es als Standard leer"
                 },
                 "validation": {
                     "maxlength": "Der Währungscode darf nur 3 Symbole enthalten"

diff --git a/src/VirtoCommerce.CoreModule.Web/Localizations/en.VirtoCommerce.Core.json b/src/VirtoCommerce.CoreModule.Web/Localizations/en.VirtoCommerce.Core.json
@@ -83,7 +83,7 @@
           "is-primary": "Enable this option to make this currency your default one. Note: Only one currency may be set as default.",
           "exchange-rate": "Please provide the exchange rate against your default currency.",
           "symbol": "Please provide a sign for this currency.",
-          "custom-formatting": "You can apply custom formatting to the currency value.",
+          "custom-formatting": "Can be any valid standard numeric format specifier, as well as any combination of custom numeric format specifiers.",
           "midpoint-rounding": "Please select an appropriate midpoint rounding method.",
           "rounding-type": "Please select an appropriate rounding type."
         },
@@ -92,7 +92,9 @@
           "code": "Please provide currency code...",
           "name": "Please provide currency name...",
           "exchange-rate": "Please provide the exchange rate against your default currency...",
-          "custom-formatting": "0.0.000"
+          "custom-formatting": "Please provide a format or leave blank for default",
+          "midpoint-rounding": "Select midpoint rounding policy",
+          "rounding-type": "Select rounding policy"
         },
         "validation": {
           "maxlength": "The currency code must consist of 3 alphabetic characters"

diff --git a/src/VirtoCommerce.CoreModule.Web/Localizations/ru.VirtoCommerce.Core.json b/src/VirtoCommerce.CoreModule.Web/Localizations/ru.VirtoCommerce.Core.json
@@ -73,7 +73,7 @@
           "is-primary": "Является основной",
           "exchange-rate": "Обменный курс",
           "symbol": "Символ",
-          "custom-formatting": "Автоматическое форматирование валюты",
+          "custom-formatting": "Может быть любым допустимым описателем стандартного числового формата, например а также любую комбинацию описателей пользовательского числового формата.",
           "midpoint-rounding": "Округление чисел",
           "rounding-type": "Тип округления"
         },
@@ -92,7 +92,7 @@
           "code": "Укажите код валюты...",
           "name": "Укажите название валюты...",
           "exchange-rate": "Укажите курс валют по умолчанию...",
-          "custom-formatting": "0.0.000"
+          "custom-formatting": "Укажите формат или оставьте пустым для значения по умолчанию"
         },
         "validation": {
           "maxlength": "Код валюты должен состоять из З алфавитных символов"

diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Core</id>
-  <version>3.800.0</version>
+  <version>3.801.0</version>
   <version-tag />
   <platformVersion>3.800.0</platformVersion>
   <title>Commerce core module</title>