fix(i18n): finalize localization setup for Regional Market Cluster Risks

- Renamed regionClusterRisk to regionalClusterRisk across rule files
- Fixed placeholder ordering and removed redundant lines
- Corrected translation texts and cleaned up i18n files
- Followed reviewer suggestions in PR #5145a

apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts

@@ -33,8 +33,8 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
     if (asiaPacificMarketValueRatio > ruleSettings.thresholdMax) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskAsiaPacific.false.max',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskAsiaPacific.false.max',
           placeholders: {
             valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3),
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3)
@@ -45,8 +45,8 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
     } else if (asiaPacificMarketValueRatio < ruleSettings.thresholdMin) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskAsiaPacific.false.min',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskAsiaPacific.false.min',
           placeholders: {
             valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3),
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3)
@@ -58,8 +58,8 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
 
     return {
       evaluation: this.i18nService.getTranslation({
-        id: 'rule.regionClusterRiskAsiaPacific.true',
         languageCode: this.getLanguageCode(),
+        id: 'rule.regionalMarketClusterRiskAsiaPacific.true',
         placeholders: {
           valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
@@ -89,10 +89,9 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
 
   public getName() {
     return this.i18nService.getTranslation({
-      id: 'rule.regionClusterRiskAsiaPacific',
-      languageCode: this.getLanguageCode()
+      languageCode: this.getLanguageCode(),
+      id: 'rule.regionalMarketClusterRiskAsiaPacific'
     });
-    return 'Asia-Pacific';
   }
 
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {

apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts

@@ -35,8 +35,8 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     if (emergingMarketsValueRatio > ruleSettings.thresholdMax) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskEmergingMarkets.false.max',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskEmergingMarkets.false.max',
           placeholders: {
             valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3),
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3)
@@ -47,8 +47,8 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     } else if (emergingMarketsValueRatio < ruleSettings.thresholdMin) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskEmergingMarkets.false.min',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskEmergingMarkets.false.min',
           placeholders: {
             valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3),
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3)
@@ -60,8 +60,8 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
 
     return {
       evaluation: this.i18nService.getTranslation({
-        id: 'rule.regionClusterRiskEmergingMarkets.true',
         languageCode: this.getLanguageCode(),
+        id: 'rule.regionalMarketClusterRiskEmergingMarkets.true',
         placeholders: {
           valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
@@ -91,10 +91,9 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
 
   public getName() {
     return this.i18nService.getTranslation({
-      id: 'rule.regionClusterRiskEmergingMarkets',
-      languageCode: this.getLanguageCode()
+      languageCode: this.getLanguageCode(),
+      id: 'rule.regionalMarketClusterRiskEmergingMarkets'
     });
-    return 'Emerging Markets';
   }
 
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {

apps/api/src/models/rules/regional-market-cluster-risk/europe.ts

@@ -33,8 +33,8 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
     if (europeMarketValueRatio > ruleSettings.thresholdMax) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskEurope.false.max',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskEurope.false.max',
           placeholders: {
             valueRatio: (europeMarketValueRatio * 100).toPrecision(3),
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3)
@@ -45,8 +45,8 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
     } else if (europeMarketValueRatio < ruleSettings.thresholdMin) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskEurope.false.min',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskEurope.false.min',
           placeholders: {
             valueRatio: (europeMarketValueRatio * 100).toPrecision(3),
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3)
@@ -58,8 +58,8 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
 
     return {
       evaluation: this.i18nService.getTranslation({
-        id: 'rule.regionClusterRiskEurope.true',
         languageCode: this.getLanguageCode(),
+        id: 'rule.regionalMarketClusterRiskEurope.true',
         placeholders: {
           valueRatio: (europeMarketValueRatio * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
@@ -89,10 +89,9 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
 
   public getName() {
     return this.i18nService.getTranslation({
-      id: 'rule.regionClusterRiskEurope',
-      languageCode: this.getLanguageCode()
+      languageCode: this.getLanguageCode(),
+      id: 'rule.regionalMarketClusterRiskEurope'
     });
-    return 'Europe';
   }
 
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {

apps/api/src/models/rules/regional-market-cluster-risk/japan.ts

@@ -33,8 +33,8 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
     if (japanMarketValueRatio > ruleSettings.thresholdMax) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskJapan.false.max',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskJapan.false.max',
           placeholders: {
             valueRatio: (japanMarketValueRatio * 100).toPrecision(3),
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3)
@@ -45,8 +45,8 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
     } else if (japanMarketValueRatio < ruleSettings.thresholdMin) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskJapan.false.min',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskJapan.false.min',
           placeholders: {
             valueRatio: (japanMarketValueRatio * 100).toPrecision(3),
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3)
@@ -58,8 +58,8 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
 
     return {
       evaluation: this.i18nService.getTranslation({
-        id: 'rule.regionClusterRiskJapan.true',
         languageCode: this.getLanguageCode(),
+        id: 'rule.regionalMarketClusterRiskJapan.true',
         placeholders: {
           valueRatio: (japanMarketValueRatio * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
@@ -89,10 +89,9 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
 
   public getName() {
     return this.i18nService.getTranslation({
-      id: 'rule.regionClusterRiskJapan',
-      languageCode: this.getLanguageCode()
+      languageCode: this.getLanguageCode(),
+      id: 'rule.regionalMarketClusterRiskJapan'
     });
-    return 'Japan';
   }
 
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {

apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts

@@ -33,8 +33,8 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
     if (northAmericaMarketValueRatio > ruleSettings.thresholdMax) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskNorthAmerica.false.max',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskNorthAmerica.false.max',
           placeholders: {
             valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3),
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3)
@@ -45,8 +45,8 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
     } else if (northAmericaMarketValueRatio < ruleSettings.thresholdMin) {
       return {
         evaluation: this.i18nService.getTranslation({
-          id: 'rule.regionClusterRiskNorthAmerica.false.min',
           languageCode: this.getLanguageCode(),
+          id: 'rule.regionalMarketClusterRiskNorthAmerica.false.min',
           placeholders: {
             valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3),
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3)
@@ -58,8 +58,8 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
 
     return {
       evaluation: this.i18nService.getTranslation({
-        id: 'rule.regionClusterRiskNorthAmerica.true',
         languageCode: this.getLanguageCode(),
+        id: 'rule.regionalMarketClusterRiskNorthAmerica.true',
         placeholders: {
           valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
@@ -89,10 +89,9 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
 
   public getName() {
     return this.i18nService.getTranslation({
-      id: 'rule.regionClusterRiskNorthAmerica',
-      languageCode: this.getLanguageCode()
+      languageCode: this.getLanguageCode(),
+      id: 'rule.regionalMarketClusterRiskNorthAmerica'
     });
-    return 'North America';
   }
 
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {

apps/client/src/app/pages/i18n/i18n-page.html

@@ -12,73 +12,78 @@
       </li>
       <li i18n="@@myAccount">My Account</li>
       <li i18n="@@rule.accountClusterRisk.category">Account Cluster Risks</li>
-      <li i18n="@@rule.regionClusterRiskAsiaPacific">Asia-Pacific</li>
-      <li i18n="@@rule.regionClusterRiskAsiaPacific.false.max">
+      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific">Asia-Pacific</li>
+      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.max">
         The Asia-Pacific market contribution of your current investment
-        ($&#123;valueRatio&#125;%) is exceeds $&#123;thresholdMax&#125;%
+        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskAsiaPacific.false.min">
+      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.min">
         The Asia-Pacific market contribution of your current investment
         ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskAsiaPacific.true">
+      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.true">
         The Asia-Pacific market contribution of your current investment
         ($&#123;valueRatio&#125;%) is within the range of
         $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskEmergingMarkets">Emerging Markets</li>
-      <li i18n="@@rule.regionClusterRiskEmergingMarkets.false.max">
+
+      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets">
+        Emerging Markets
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.max">
         The Emerging Markets contribution of your current investment
         ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskEmergingMarkets.false.min">
+      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.min">
         The Emerging Markets contribution of your current investment
         ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskEmergingMarkets.true">
+      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.true">
         The Emerging Markets contribution of your current investment
         ($&#123;valueRatio&#125;%) is within the range of
         $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
       </li>
 
-      <li i18n="@@rule.regionClusterRiskEurope">Europe</li>
-      <li i18n="@@rule.regionClusterRiskEurope.false.max">
+      <li i18n="@@rule.regionalMarketClusterRiskEurope">Europe</li>
+      <li i18n="@@rule.regionalMarketClusterRiskEurope.false.max">
         The Europe market contribution of your current investment
         ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskEurope.false.min">
+      <li i18n="@@rule.regionalMarketClusterRiskEurope.false.min">
         The Europe market contribution of your current investment
         ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskEurope.true">
+      <li i18n="@@rule.regionalMarketClusterRiskEurope.true">
         The Europe market contribution of your current investment
         ($&#123;valueRatio&#125;%) is within the range of
         $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskJapan">Japan</li>
-      <li i18n="@@rule.regionClusterRiskJapan.false.max">
+
+      <li i18n="@@rule.regionalMarketClusterRiskJapan">Japan</li>
+      <li i18n="@@rule.regionalMarketClusterRiskJapan.false.max">
         The Japan market contribution of your current investment
         ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskJapan.false.min">
+      <li i18n="@@rule.regionalMarketClusterRiskJapan.false.min">
         The Japan market contribution of your current investment
         ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskJapan.true">
+      <li i18n="@@rule.regionalMarketClusterRiskJapan.true">
         The Japan market contribution of your current investment
         ($&#123;valueRatio&#125;%) is within the range of
         $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskNorthAmerica">North America</li>
-      <li i18n="@@rule.regionClusterRiskNorthAmerica.false.max">
+
+      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica">North America</li>
+      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.max">
         The North America market contribution of your current investment
         ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskNorthAmerica.false.min">
+      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.min">
         The North America market contribution of your current investment
         ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
       </li>
-      <li i18n="@@rule.regionClusterRiskNorthAmerica.true">
+      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.true">
         The North America market contribution of your current investment
         ($&#123;valueRatio&#125;%) is within the range of
         $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%