Merge branch 'main' into actions
This commit is contained in:
commit
85043b34a4
2 changed files with 4 additions and 3 deletions
|
@ -24,7 +24,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
|
||||||
**Additional translations:**
|
**Additional translations:**
|
||||||
|
|
||||||
* Japanese (thanks to [@shak](https://hosted.weblate.org/user/shak/))
|
* Japanese (thanks to [@shak](https://hosted.weblate.org/user/shak/))
|
||||||
* Russian (*incomplete*, thanks to [@flamey](https://hosted.weblate.org/user/flamey/))
|
* Russian (thanks to [@flamey](https://hosted.weblate.org/user/flamey/) and [@ilya.mikheev.coder](https://hosted.weblate.org/user/ilya.mikheev.coder/))
|
||||||
|
|
||||||
## ntfy server v1.21.0 (UNRELEASED)
|
## ntfy server v1.21.0 (UNRELEASED)
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
|
||||||
* Indonesian (thanks to [@linerly](https://hosted.weblate.org/user/linerly/))
|
* Indonesian (thanks to [@linerly](https://hosted.weblate.org/user/linerly/))
|
||||||
* Japanese (thanks to [@shak](https://hosted.weblate.org/user/shak/))
|
* Japanese (thanks to [@shak](https://hosted.weblate.org/user/shak/))
|
||||||
* Norwegian Bokmål (thanks to [@comradekingu](https://github.com/comradekingu))
|
* Norwegian Bokmål (thanks to [@comradekingu](https://github.com/comradekingu))
|
||||||
* Russian (*incomplete*, thanks to [@flamey](https://hosted.weblate.org/user/flamey/))
|
* Russian (thanks to [@flamey](https://hosted.weblate.org/user/flamey/) and [@ilya.mikheev.coder](https://hosted.weblate.org/user/ilya.mikheev.coder/))
|
||||||
* Spanish (thanks to [@rogeliodh](https://github.com/rogeliodh))
|
* Spanish (thanks to [@rogeliodh](https://github.com/rogeliodh))
|
||||||
* Turkish (thanks to [@ersen](https://ersen.moe/))
|
* Turkish (thanks to [@ersen](https://ersen.moe/))
|
||||||
|
|
||||||
|
|
|
@ -423,7 +423,7 @@ const Appearance = () => {
|
||||||
|
|
||||||
const Language = () => {
|
const Language = () => {
|
||||||
const { t, i18n } = useTranslation();
|
const { t, i18n } = useTranslation();
|
||||||
const randomFlags = shuffle(["🇬🇧", "🇺🇸", "🇪🇸", "🇧🇬", "🇩🇪", "🇮🇩", "🇯🇵", "🇹🇷"]).slice(0, 3);
|
const randomFlags = shuffle(["🇬🇧", "🇺🇸", "🇪🇸", "🇧🇬", "🇩🇪", "🇮🇩", "🇯🇵", "🇷🇺", "🇹🇷"]).slice(0, 3);
|
||||||
const title = t("prefs_appearance_language_title") + " " + randomFlags.join(" ");
|
const title = t("prefs_appearance_language_title") + " " + randomFlags.join(" ");
|
||||||
|
|
||||||
// Remember: Flags are not languages. Don't put flags next to the language in the list.
|
// Remember: Flags are not languages. Don't put flags next to the language in the list.
|
||||||
|
@ -441,6 +441,7 @@ const Language = () => {
|
||||||
<MenuItem value="id">Bahasa Indonesia</MenuItem>
|
<MenuItem value="id">Bahasa Indonesia</MenuItem>
|
||||||
<MenuItem value="ja">日本語</MenuItem>
|
<MenuItem value="ja">日本語</MenuItem>
|
||||||
<MenuItem value="nb_NO">Norsk bokmål</MenuItem>
|
<MenuItem value="nb_NO">Norsk bokmål</MenuItem>
|
||||||
|
<MenuItem value="ru">Русский</MenuItem>
|
||||||
<MenuItem value="tr">Türkçe</MenuItem>
|
<MenuItem value="tr">Türkçe</MenuItem>
|
||||||
</Select>
|
</Select>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
|
|
Loading…
Reference in a new issue