Skip to content

Commit

Permalink
fix: allow custom translations to be passed (#6752)
Browse files Browse the repository at this point in the history
* feat: allow extra translation sources in i18n

* refactor(i18n): properly laod i18n translations (no more merge)

* update comments

* fix eslint
  • Loading branch information
elevatebart authored Jan 15, 2025
1 parent 717d556 commit b3b3a5b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
4 changes: 3 additions & 1 deletion ui/src/components/dashboard/components/DashboardEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@
import ChartBar from "vue-material-design-icons/ChartBar.vue";
import FileDocumentEditOutline from "vue-material-design-icons/FileDocumentEditOutline.vue";
import ViewDashboard from "vue-material-design-icons/ViewDashboard.vue";
// avoid an eslint warning about missing declaration
defineEmits(["save"])
</script>
<script>
import Editor from "../../inputs/Editor.vue";
Expand Down Expand Up @@ -186,7 +189,6 @@
return this.currentView !== this.views.NONE && this.currentView !== this.views.DASHBOARD;
}
},
emits: ["save"],
props: {
allowSaveUnchanged: {
type: Boolean,
Expand Down
14 changes: 11 additions & 3 deletions ui/src/translations/i18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,17 @@ export function setI18nLanguage(i18n: I18n, locale: (typeof SUPPORT_LOCALES)[num
document.querySelector("html")?.setAttribute("lang", locale)
}

export async function loadLocaleMessages(i18n: I18n, locale: (typeof SUPPORT_LOCALES)[number]) {
// load locale messages with dynamic import
const messages = await translations[`./${locale}.json`]() as any
export async function loadLocaleMessages(i18n: I18n, locale: (typeof SUPPORT_LOCALES)[number], additionalTranslationsProvider: Record<string, () => Promise<any>>) {
const messages = {default: {}} as any

if(additionalTranslationsProvider[locale]){
// load additional translations from the provider
const additionalTranslations = await additionalTranslationsProvider[locale]()
messages.default[locale] = additionalTranslations.default[locale]
}else{
// load locale messages with dynamic import
messages.default[locale] = await translations[`./${locale}.json`]() as any
}

// set locale and locale message
i18n.global.setLocaleMessage(locale, messages.default[locale])
Expand Down
4 changes: 2 additions & 2 deletions ui/src/utils/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import RouterMd from "../components/utils/RouterMd.vue";
import Utils from "./utils";
import TaskTaskRunner from "../components/flows/tasks/TaskTaskRunner.vue";

export default async (app, routes, stores, translations) => {
export default async (app, routes, stores, translations, additionalTranslations = {}) => {
// charts
Chart.register(
CategoryScale,
Expand Down Expand Up @@ -148,7 +148,7 @@ export default async (app, routes, stores, translations) => {
});

if(locale !== "en"){
await loadLocaleMessages(i18n, locale);
await loadLocaleMessages(i18n, locale, additionalTranslations);
await setI18nLanguage(i18n, locale);
}

Expand Down

0 comments on commit b3b3a5b

Please sign in to comment.