Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sort and translate font name at OSD tab #3621

Merged
merged 3 commits into from
Nov 1, 2023
Merged

Sort and translate font name at OSD tab #3621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
557e262
Translate font name in OSD tab
HThuren Oct 30, 2023
e1295f9
minor changes
HThuren Nov 1, 2023
9ff5048
minor changes 2
HThuren Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5058,10 +5058,50 @@
"message": "OSD Profile {{profileNumber}}",
"description": "Content of the selector for the OSD Profile in the preview"
},
"osdSetupPreviewSelectFontElement": {
"message": "Font {{fontName}}",
"osdSetupPreviewSelectFont": {
"message": "Font",
"description": "Content of the selector for the OSD Font in the preview"
},
"osdSetupFontTypeDefault": {
"message": "Default",
"description": "Font Default"
},
"osdSetupFontTypeBold": {
"message": "Bold",
"description": "Font Bold"
},
"osdSetupFontTypeLarge": {
"message": "Large",
"description": "Font Large"
},
"osdSetupFontTypeLargeExtra": {
"message": "Large Extra",
"description": "Font Large Extra"
},
"osdSetupFontTypeBetaflight": {
"message": "Betaflight",
"description": "Font Betaflight"
},
"osdSetupFontTypeDigital": {
"message": "Digital",
"description": "Font Digital"
},
"osdSetupFontTypeClarity": {
"message": "Clarity",
"description": "Font Clarity"
},
"osdSetupFontTypeVision": {
"message": "Vision",
"description": "Font Vision"
},
"osdSetupFontTypeImpact": {
"message": "Impact",
"description": "Font Impact"
},
"osdSetupFontTypeImpactMini": {
"message": "Impact Mini",
"description": "Font Impact Mini"
},
"osdSetupPreviewCheckZoom": {
"message": "Zoom",
"description": "Check to select a bigger display of the OSD preview in small screens"
Expand Down
31 changes: 18 additions & 13 deletions src/js/tabs/osd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1830,16 +1830,16 @@ OSD.constants = {

},
FONT_TYPES: [
{ file: "default", name: "Default" },
{ file: "bold", name: "Bold" },
{ file: "large", name: "Large" },
{ file: "extra_large", name: "Extra Large" },
{ file: "betaflight", name: "Betaflight" },
{ file: "digital", name: "Digital" },
{ file: "clarity", name: "Clarity" },
{ file: "vision", name: "Vision" },
{ file: "impact", name: "Impact" },
{ file: "impact_mini", name: "Impact Mini" },
{ file: "default", name: "osdSetupFontTypeDefault" },
{ file: "bold", name: "osdSetupFontTypeBold" },
{ file: "large", name: "osdSetupFontTypeLarge" },
{ file: "extra_large", name: "osdSetupFontTypeLargeExtra" },
{ file: "betaflight", name: "osdSetupFontTypeBetaflight" },
{ file: "digital", name: "osdSetupFontTypeDigital" },
{ file: "clarity", name: "osdSetupFontTypeClarity" },
{ file: "vision", name: "osdSetupFontTypeVision" },
{ file: "impact", name: "osdSetupFontTypeImpact" },
{ file: "impact_mini", name: "osdSetupFontTypeImpactMini" },
],
};

Expand Down Expand Up @@ -2666,11 +2666,14 @@ osd.initialize = function(callback) {
const option = $('<option>', {
"data-font-file": e.file,
value: e.file,
text: e.name,
text: i18n.getMessage(e.name),
});
fontPresetsElement.append($(option));
});

// Sort the element, if need to group, do it by lexical sort, ie. by naming of (the translated) selection text
fontPresetsElement.sortSelect(i18n.getMessage("osdSetupFontTypeDefault"));

const fontbuttons = $('.fontpresets_wrapper');
fontbuttons.append($('<button>', { class: "load_font_file", i18n: "osdSetupOpenFont" }));

Expand Down Expand Up @@ -3040,10 +3043,12 @@ osd.initialize = function(callback) {

// Standard fonts
OSD.constants.FONT_TYPES.forEach(function(e) {
const optionText = i18n.getMessage('osdSetupPreviewSelectFontElement', {fontName : e.name});
osdFontSelectorElement.append(new Option(optionText, e.file));
osdFontSelectorElement.append(new Option(i18n.getMessage(e.name), e.file));
});

// Sort the element, if need to group, do it by lexical sort, ie. by naming of (the translated) selection text
osdFontSelectorElement.sortSelect(i18n.getMessage("osdSetupFontTypeDefault"));

osdFontSelectorElement.change(function() {
// Change the font selected in the Font Manager, in this way it is easier to flash if the user likes it
osdFontPresetsSelectorElement.val(this.value).change();
Expand Down
1 change: 1 addition & 0 deletions src/tabs/osd.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ <h1 class="tab_title">
<select class="osdprofile-selector">
<!-- Populated at runtime -->
</select>
<label id="osdprofile-selector-font" i18n="osdSetupPreviewSelectFont"></label>
<select class="osdfont-selector">
<!-- Populated at runtime -->
</select>
Expand Down