Skip to content

Commit

Permalink
Fix locale import missing translation properties (#2772)
Browse files Browse the repository at this point in the history
* Fix locale import missing translation properties
  • Loading branch information
7dJx1qP authored Jul 25, 2022
1 parent 7f86509 commit 8e222ae
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ui/v2.5/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ export const App: React.FC = () => {
const defaultMessageLanguage = languageMessageString(defaultLocale);
const messageLanguage = languageMessageString(language);

const defaultMessages = await locales[defaultMessageLanguage]();
const defaultMessages = (await locales[defaultMessageLanguage]()).default;
const mergedMessages = cloneDeep(Object.assign({}, defaultMessages));
const chosenMessages = await locales[messageLanguage]();
const chosenMessages = (await locales[messageLanguage]()).default;
mergeWith(mergedMessages, chosenMessages, (objVal, srcVal) => {
if (srcVal === "") {
return objVal;
Expand Down
1 change: 1 addition & 0 deletions ui/v2.5/src/components/Changelog/versions/v0161.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### 🐛 Bug fixes
* Fix New button not being localised correctly. ([#2772](https://github.com/stashapp/stash/pull/2772))
* Fix scene player losing focus when playing next/previous scene. ([#2758](https://github.com/stashapp/stash/pull/2758))
* Fix UI crash when % character used in tag names. ([#2757](https://github.com/stashapp/stash/pull/2757))
* Fix keyboard shortcuts not working after selecting an object. ([#2750](https://github.com/stashapp/stash/pull/2750))
Expand Down

0 comments on commit 8e222ae

Please sign in to comment.