Fix translation loading issue and ensure translations are applied before updating UI #293
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,50 @@ | ||
| // Assuming i18n is some object and its methods need to be handled manually, | ||
| // if you are using a library for i18n, the load mechanism might be similar | ||
| function loadTranslations(callback) { | ||
| // Assuming i18n is an object with a load method | ||
| const i18n = { | ||
| locale: 'en', // Replace with dynamic locale if needed | ||
| load: function(url, locale) { | ||
| return fetch(url) | ||
| .then(response => response.json()) | ||
| .then(data => { | ||
| this.translations = data; | ||
| }); | ||
| }, | ||
| get: function(key) { | ||
| return this.translations[key] || key; // Return the translation or the key itself if not found | ||
| } | ||
| }; | ||
|
|
||
| // Load the translation file | ||
| i18n.load('../assets/lang/ui_' + i18n.locale + '.json', i18n.locale) | ||
|
Member
There was a problem hiding this comment. Can we return the promise from |
||
| .then(function() { | ||
| callback(); // Once translations are loaded, call the callback function | ||
| }); | ||
| } | ||
|
|
||
| function _T(key) { | ||
| 'use strict'; | ||
| const i18n = { translations: {} }; // Assuming i18n object | ||
| return i18n.get(key); // Directly return the translation after it's loaded | ||
| } | ||
|
|
||
|
Member
There was a problem hiding this comment. Where is this now? The translated string should update when the number of kittens, the person or the language is changed. |
||
| document.addEventListener('DOMContentLoaded', function () { | ||
| loadTranslations(function() { | ||
| // Now that translations are loaded, populate the formats object | ||
| const formats = { | ||
| portrait: _T('text-portrait'), | ||
| landscape: _T('text-landscape'), | ||
| square: _T('text-square') | ||
| }; | ||
|
|
||
| // Instead of $.each(), use Object.keys() and forEach() in vanilla JS | ||
| Object.keys(formats).forEach(function(key) { | ||
| console.log('appending ' + key); | ||
|
|
||
| const option = document.createElement('option'); | ||
| option.value = key; | ||
| option.textContent = formats[key]; | ||
| document.getElementById('format').appendChild(option); | ||
| }); | ||
| }); | ||
| }); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The locale should be determined based on the value selected in the dropdown