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

Add Latin hyphenation #6910

Merged
merged 3 commits into from Nov 26, 2020
Merged

Add Latin hyphenation #6910

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
822456b
Add Latin hyph
jperon Nov 24, 2020
0a02c91
Latin (liturgical)
jperon Nov 26, 2020
68e1d23
bump base
jperon Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion base
Open in desktop
Submodule base updated 6 files
+12 −8 ffi/blitbuffer.lua
+90 −0 input/atomicio.h
+63 −20 input/libue.h
+1 −1 thirdparty/fbink/CMakeLists.txt
+1 −1 thirdparty/kobo-usbms/CMakeLists.txt
+1 −1 thirdparty/kpvcrlib/crengine
2 changes: 2 additions & 0 deletions frontend/apps/reader/modules/readertypography.lua
View file
Open in desktop
Expand Up @@ -66,6 +66,8 @@ local LANGUAGES = {
{ "it", {"ita"}, "H ", _("Italian"), "Italian.pattern" },
{ "ja", {}, " ", _("Japanese") },
{ "ko", {}, " ", _("Korean") },
{ "la-lit", {"lat-lit"}, "H ", _("Latin (liturgical)"), "Latin.pattern" },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like I'm too late, but that should of course be Latin_liturgical.pattern. ;-)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going to fix that (no real issue, just a display one, we'll show the hyph filename instead of this pretty language name).
While I'm at it, should these be re-ordered, so the shorter/plain name is first, before the next longer/specific ones?

     { "ko",                    {},   "    ",   _("Korean") },
-    { "la-lit",       {"lat-lit"},   "H   ",   _("Latin (liturgical)"),
     { "la",               {"lat"},   "H   ",   _("Latin"),
+    { "la-lit",       {"lat-lit"},   "H   ",   _("Latin (liturgical)"),
     { "lv",               {"lav"},   "H   ",   _("Latvian"),
@@ -77,9 +77,9 @@ local LANGUAGES = {
     { "pms",                   {},   "H   ",   _("Piedmontese"),
-    { "pt-BR",                 {},   "HB  ",   _("Portuguese (BR)"),
     { "pt",               {"por"},   "HB  ",   _("Portuguese"),
+    { "pt-BR",                 {},   "HB  ",   _("Portuguese (BR)"),
     { "rm",               {"roh"},   "H   ",   _("Romansh"),
     { "ro",               {"ron"},   "H   ",   _("Romanian"),
+    { "ru",               {"rus"},   "Hb  ",   _("Russian"),
     { "ru-GB",                 {},   "Hb  ",   _("Russian + English (UK)"),
     { "ru-US",                 {},   "Hb  ",   _("Russian + English (US)"),
-    { "ru",               {"rus"},   "Hb  ",   _("Russian"),
     { "sr",               {"srp"},   "HB  ",   _("Serbian"),

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(It needs to be in the current order in crengine to match longer ones first - but in frontend, this order does not matter.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely makes more sense to me.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done with #6913.

{ "la", {"lat"}, "H ", _("Latin"), "Latin.pattern" },
jperon marked this conversation as resolved.
Show resolved Hide resolved
{ "lv", {"lav"}, "H ", _("Latvian"), "Latvian.pattern" },
{ "lt", {"lit"}, "H ", _("Lithuanian"), "Lithuanian.pattern" },
{ "mk", {""}, "H ", _("Macedonian"), "Macedonian.pattern" },
Expand Down