Skip to content

Commit

Permalink
Rollback localizer workaround (#1506)
Browse files Browse the repository at this point in the history
* Restore original functionalioty, removing workaround.

* reverted english localization

* roll back french language workaround

* fixed linting

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
KingBain and github-actions[bot] authored Dec 17, 2024
1 parent 954cc1f commit da9ac2e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
base.OnParametersSet();

if (PercentBudgetSpent <= 100) return;

_logger.LogWarning("PercentBudgetSpent is greater than 100. Setting to 100.");
PercentBudgetSpent = 100;
}
Expand All @@ -46,13 +46,13 @@
switch (PercentBudgetSpent)
{
case < 75:
return Localizer["This workspace has consumed {{BudgetPercent}}% of its budget. It is recommended to monitor the usage as the workspace resources will be deleted if the budget is exceeded."].ToString().Replace("{{BudgetPercent}}", PercentBudgetSpent.ToString("F2"));
return Localizer["This workspace has consumed {0:F2}% of its budget. It is recommended to monitor the usage as the workspace resources will be deleted if the budget is exceeded.", PercentBudgetSpent];
case < 90:
return Localizer["This workspace has consumed {{BudgetPercent}}% of its budget. It is strongly recommended to reach out to the workspace lead to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded."].ToString().Replace("{{BudgetPercent}}", PercentBudgetSpent.ToString("F2"));
return Localizer["This workspace has consumed {0:F2}% of its budget. It is strongly recommended to reach out to the workspace lead to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.", PercentBudgetSpent];
case < 100:
return Localizer["This workspace has consumed {{BudgetPercent}}% of its budget. Please contact the workspace lead immediately to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded."].ToString().Replace("{{BudgetPercent}}", PercentBudgetSpent.ToString("F2"));
return Localizer["This workspace has consumed {0:F2}% of its budget. Please contact the workspace lead immediately to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.", PercentBudgetSpent];
case 100:
return Localizer["This workspace has consumed {{BudgetPercent}}% of its budget. The workspace resources have been deleted or scheduled for deletion due to exceeding the budget."].ToString().Replace("{{BudgetPercent}}", PercentBudgetSpent.ToString("F2"));
return Localizer["This workspace has consumed {0:F2}% of its budget. The workspace resources have been deleted or scheduled for deletion due to exceeding the budget.", PercentBudgetSpent];
default:
throw new ArgumentOutOfRangeException();
}
Expand Down
10 changes: 5 additions & 5 deletions Portal/src/Datahub.Portal/i18n/localization.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -2575,10 +2575,10 @@
"This web application is not configured yet. Please configure it by clicking the \u0027Configure\u0027 button at the top right of the page.": "Cette application web n'est pas encore configurée. Veuillez la configurer en cliquant sur le bouton \u0027Configurer\u0027 en haut à droite de la page.",
"This web application is not provisioned yet. Please come back soon.": "Cette application web n'est pas encore provisionnée. Revenez bientôt.",
"This workspace has been deleted": "Cet espace de travail a été supprimé",
"This workspace has consumed {{BudgetPercent}}% of its budget. It is recommended to monitor the usage as the workspace resources will be deleted if the budget is exceeded.": "Cet espace de travail a consommé {{BudgetPercent}}% de son budget. Il est recommandé de surveiller l'utilisation, car les ressources de l'espace de travail seront supprimées si le budget est dépassé.",
"This workspace has consumed {{BudgetPercent}}% of its budget. It is strongly recommended to reach out to the workspace lead to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.": "Cet espace de travail a consommé {{BudgetPercent}}% de son budget. Il est fortement recommandé de contacter le responsable de l'espace de travail pour discuter de l'utilisation du budget, car les ressources de l'espace de travail seront supprimées si le budget est dépassé.",
"This workspace has consumed {{BudgetPercent}}% of its budget. Please contact the workspace lead immediately to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.": "Cet espace de travail a consommé {{BudgetPercent}}% de son budget. Veuillez contacter immédiatement le responsable de l'espace de travail pour discuter de l'utilisation du budget, car les ressources de l'espace de travail seront supprimées si le budget est dépassé.",
"This workspace has consumed {{BudgetPercent}}% of its budget. The workspace resources have been deleted or scheduled for deletion due to exceeding the budget.": "Cet espace de travail a consommé {{BudgetPercent}}% de son budget. Les ressources de l'espace de travail ont été supprimées ou sont programmées pour être supprimées en raison du dépassement du budget.",
"This workspace has consumed {0:F2}% of its budget. It is recommended to monitor the usage as the workspace resources will be deleted if the budget is exceeded.": "Cet espace de travail a consommé {0:F2}% de son budget. Il est recommandé de surveiller l'utilisation, car les ressources de l'espace de travail seront supprimées si le budget est dépassé.",
"This workspace has consumed {0:F2}% of its budget. It is strongly recommended to reach out to the workspace lead to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.": "Cet espace de travail a consommé {0:F2}% de son budget. Il est fortement recommandé de contacter le responsable de l'espace de travail pour discuter de l'utilisation du budget, car les ressources de l'espace de travail seront supprimées si le budget est dépassé.",
"This workspace has consumed {0:F2}% of its budget. Please contact the workspace lead immediately to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.": "Cet espace de travail a consommé {0:F2}% de son budget. Veuillez contacter immédiatement le responsable de l'espace de travail pour discuter de l'utilisation du budget, car les ressources de l'espace de travail seront supprimées si le budget est dépassé.",
"This workspace has consumed {0:F2}% of its budget. The workspace resources have been deleted or scheduled for deletion due to exceeding the budget.": "Cet espace de travail a consommé {0:F2}% de son budget. Les ressources de l'espace de travail ont été supprimées ou sont programmées pour être supprimées en raison du dépassement du budget.",
"Thursday": "Jeudi",
"Ticket Description": "Description",
"Ticket Topics": "Sujets",
Expand Down Expand Up @@ -2977,4 +2977,4 @@
"{0} successfully added to your workspace": "{0} ajouté avec succès à votre espace de travail",
"Shared Key Access is disabled. Please enable it in workspace settings to allow token generation.": "L'accès par clé partagée est désactivé. Veuillez l'activer dans les paramètres de l'espace de travail pour permettre la génération de jetons.",
"SAS Token generation is restricted. Please contact your workspace lead or administrators to get a token.": "La génération de jetons SAS est restreinte. Veuillez contacter le responsable de votre espace de travail ou les administrateurs pour obtenir un jeton."
}
}
10 changes: 5 additions & 5 deletions Portal/src/Datahub.Portal/i18n/localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -1732,10 +1732,10 @@
"This web application is not configured yet. Please configure it by clicking the \u0028Configure\u0027 button at the top right of the page.": "This web application is not configured yet. Please configure it by clicking the \u0027Configure\u0027 button at the top right of the page.",
"This web application is not provisioned yet. Please come back soon.": "This web application is not provisioned yet. Please come back soon.",
"This workspace has been deleted": "This workspace has been deleted",
"This workspace has consumed {{BudgetPercent}}% of its budget. It is recommended to monitor the usage as the workspace resources will be deleted if the budget is exceeded.": "This workspace has consumed {{BudgetPercent}}% of its budget. It is recommended to monitor the usage as the workspace resources will be deleted if the budget is exceeded.",
"This workspace has consumed {{BudgetPercent}}% of its budget. It is strongly recommended to reach out to the workspace lead to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.": "This workspace has consumed {{BudgetPercent}}% of its budget. It is strongly recommended to reach out to the workspace lead to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.",
"This workspace has consumed {{BudgetPercent}}% of its budget. Please contact the workspace lead immediately to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.": "This workspace has consumed {{BudgetPercent}}% of its budget. Please contact the workspace lead immediately to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.",
"This workspace has consumed {{BudgetPercent}}% of its budget. The workspace resources have been deleted or scheduled for deletion due to exceeding the budget.": "This workspace has consumed {{BudgetPercent}}% of its budget. The workspace resources have been deleted or scheduled for deletion due to exceeding the budget.",
"This workspace has consumed {0:F2}% of its budget. It is recommended to monitor the usage as the workspace resources will be deleted if the budget is exceeded.": "This workspace has consumed {0:F2}% of its budget. It is recommended to monitor the usage as the workspace resources will be deleted if the budget is exceeded.",
"This workspace has consumed {0:F2}% of its budget. It is strongly recommended to reach out to the workspace lead to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.": "This workspace has consumed {0:F2}% of its budget. It is strongly recommended to reach out to the workspace lead to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.",
"This workspace has consumed {0:F2}% of its budget. Please contact the workspace lead immediately to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.": "This workspace has consumed {0:F2}% of its budget. Please contact the workspace lead immediately to discuss the budget usage as the workspace resources will be deleted if the budget is exceeded.",
"This workspace has consumed {0:F2}% of its budget. The workspace resources have been deleted or scheduled for deletion due to exceeding the budget.": "This workspace has consumed {0:F2}% of its budget. The workspace resources have been deleted or scheduled for deletion due to exceeding the budget.",
"Ticket Description": "Ticket Description",
"Ticket Topics": "Ticket Topics",
"Timeline": "Timeline",
Expand Down Expand Up @@ -2040,4 +2040,4 @@
"{0} successfully added to your workspace": "{0} successfully added to your workspace",
"Shared Key Access is disabled. Please enable it in workspace settings to allow token generation.": "Shared Key Access is disabled. Please enable it in workspace settings to allow token generation.",
"SAS Token generation is restricted. Please contact your workspace lead or administrators to get a token.": "SAS Token generation is restricted. Please contact your workspace lead or administrators to get a token."
}
}

0 comments on commit da9ac2e

Please sign in to comment.