contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

LanguagePicker now has a proper constructor

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-07-03 00:30:11 +02:00
parent 8047f69fea
commit 51a6756dd4
6 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
UI/AllThemesGui.ts
View file

@ -5,7 +5,7 @@ import MoreScreen from "./BigComponents/MoreScreen";
import Translations from "./i18n/Translations"; import Translations from "./i18n/Translations";
import Constants from "../Models/Constants"; import Constants from "../Models/Constants";
import {Utils} from "../Utils"; import {Utils} from "../Utils";
import LanguagePicker from "./LanguagePicker"; import LanguagePicker1 from "./LanguagePicker";
import IndexText from "./BigComponents/IndexText"; import IndexText from "./BigComponents/IndexText";
import FeaturedMessage from "./BigComponents/FeaturedMessage"; import FeaturedMessage from "./BigComponents/FeaturedMessage";
import Toggle from "./Input/Toggle"; import Toggle from "./Input/Toggle";
@ -21,7 +21,7 @@ export default class AllThemesGui {
const state = new UserRelatedState(undefined); const state = new UserRelatedState(undefined);
const intro = new Combine([ const intro = new Combine([
LanguagePicker.CreateLanguagePicker(Translations.t.index.title.SupportedLanguages()) new LanguagePicker1(Translations.t.index.title.SupportedLanguages(), "")
.SetClass("flex absolute top-2 right-3"), .SetClass("flex absolute top-2 right-3"),
new IndexText() new IndexText()

3
UI/BigComponents/ThemeIntroductionPanel.ts
View file

@ -9,7 +9,6 @@ import Svg from "../../Svg";
import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig";
import {OsmConnection} from "../../Logic/Osm/OsmConnection"; import {OsmConnection} from "../../Logic/Osm/OsmConnection";
import FullWelcomePaneWithTabs from "./FullWelcomePaneWithTabs"; import FullWelcomePaneWithTabs from "./FullWelcomePaneWithTabs";
import Title from "../Base/Title";
export default class ThemeIntroductionPanel extends Combine { export default class ThemeIntroductionPanel extends Combine {
@ -17,7 +16,7 @@ export default class ThemeIntroductionPanel extends Combine {
const t = Translations.t.general const t = Translations.t.general
const layout = state.layoutToUse const layout = state.layoutToUse
const languagePicker = LanguagePicker.CreateLanguagePicker(layout.language, t.pickLanguage.Clone()) const languagePicker = new LanguagePicker(layout.language, t.pickLanguage.Clone())
const toTheMap = new SubtleButton( const toTheMap = new SubtleButton(
undefined, undefined,

2
UI/BigComponents/UserBadge.ts
View file

@ -39,7 +39,7 @@ export default class UserBadge extends LoginToggle {
}); });
const linkStyle = "flex items-baseline" const linkStyle = "flex items-baseline"
const languagePicker = (LanguagePicker.CreateLanguagePicker(state.layoutToUse.language) ?? new FixedUiElement("")) const languagePicker = (new LanguagePicker(state.layoutToUse.language, "") ?? new FixedUiElement(""))
.SetStyle("width:min-content;"); .SetStyle("width:min-content;");
let messageSpan = let messageSpan =

2
UI/ImportFlow/ImportHelperGui.ts
View file

@ -62,7 +62,7 @@ export default class ImportHelperGui extends LeftIndex {
}), }),
toc, toc,
new Toggle(t.testMode.SetClass("block alert"), undefined, state.featureSwitchIsTesting), new Toggle(t.testMode.SetClass("block alert"), undefined, state.featureSwitchIsTesting),
LanguagePicker.CreateLanguagePicker(Translations.t.importHelper.title.SupportedLanguages())?.SetClass("mt-4 self-end flex-col"), new LanguagePicker(Translations.t.importHelper.title.SupportedLanguages(), "")?.SetClass("mt-4 self-end flex-col"),
].map(el => el?.SetClass("pl-4")) ].map(el => el?.SetClass("pl-4"))
super( super(

46
UI/LanguagePicker.ts
View file

@ -8,52 +8,52 @@ import * as used_languages from "../assets/generated/used_languages.json"
import Lazy from "./Base/Lazy"; import Lazy from "./Base/Lazy";
import Toggle from "./Input/Toggle"; import Toggle from "./Input/Toggle";
export default class LanguagePicker { export default class LanguagePicker extends Toggle {
public static CreateLanguagePicker( constructor(languages: string[],
languages: string[], label: string | BaseUIElement = "") {
label: string | BaseUIElement = "") : BaseUIElement{
if (languages === undefined || languages.length <= 1) { if (languages === undefined || languages.length <= 1) {
return undefined; return undefined;
} }
const allLanguages : string[] = used_languages.languages; const allLanguages: string[] = used_languages.languages;
const normalPicker = LanguagePicker.dropdownFor(languages, label); const normalPicker = LanguagePicker.dropdownFor(languages, label);
const fullPicker = new Lazy(() => LanguagePicker.dropdownFor(allLanguages, label)) const fullPicker = new Lazy(() => LanguagePicker.dropdownFor(allLanguages, label))
return new Toggle(fullPicker, normalPicker, Locale.showLinkToWeblate) super(fullPicker, normalPicker, Locale.showLinkToWeblate);
} }
private static dropdownFor(languages: string[], label: string | BaseUIElement): BaseUIElement { private static dropdownFor(languages: string[], label: string | BaseUIElement): BaseUIElement {
return new DropDown(label, languages return new DropDown(label, languages
.filter(lang => lang !== "_context") .filter(lang => lang !== "_context")
.map(lang => { .map(lang => {
return {value: lang, shown: LanguagePicker.hybrid(lang) } return {value: lang, shown: LanguagePicker.hybrid(lang)}
} }
), Locale.language) ), Locale.language)
} }
private static hybrid(lang: string): Translation { private static hybrid(lang: string): Translation {
const nativeText = native[lang] ?? lang const nativeText = native[lang] ?? lang
const allTranslations = (language_translations["default"] ?? language_translations) const allTranslations = (language_translations["default"] ?? language_translations)
const translation = {} const translation = {}
const trans = allTranslations[lang] const trans = allTranslations[lang]
if(trans === undefined){ if (trans === undefined) {
return new Translation({"*": nativeText}) return new Translation({"*": nativeText})
} }
for (const key in trans) { for (const key in trans) {
const translationInKey = allTranslations[lang][key] const translationInKey = allTranslations[lang][key]
if(nativeText.toLowerCase() === translationInKey.toLowerCase()){ if (nativeText.toLowerCase() === translationInKey.toLowerCase()) {
translation[key] = nativeText translation[key] = nativeText
}else{ } else {
translation[key] = nativeText + " ("+translationInKey+")" translation[key] = nativeText + " (" + translationInKey + ")"
} }
} }
return new Translation(translation) return new Translation(translation)
} }
} }

2
UI/ProfessionalGui.ts
View file

@ -98,7 +98,7 @@ class ProfessionalGui extends LeftIndex {
maxDepth: 2 maxDepth: 2
}).SetClass("subtle"), }).SetClass("subtle"),
LanguagePicker.CreateLanguagePicker(Translations.t.professional.title.SupportedLanguages())?.SetClass("mt-4 self-end flex-col"), new LanguagePicker(Translations.t.professional.title.SupportedLanguages(), "")?.SetClass("mt-4 self-end flex-col"),
].map(el => el?.SetClass("pl-4")) ].map(el => el?.SetClass("pl-4"))
super(leftContents, content) super(leftContents, content)