Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-04-20 22:11:32 +02:00
Code Issues Projects Releases Wiki Activity

Fix locale import missing translation properties (#2772)

Browse source 
* Fix locale import missing translation properties
This commit is contained in:
7dJx1qP 2022-07-24 20:46:43 -04:00 committed by GitHub
parent 7f86509674
commit 8e222ae387
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/v2.5/src/App.tsx
View file

@ -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;

1
ui/v2.5/src/components/Changelog/versions/v0161.md
View file

@ -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))