Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Fix incorrect and incosistent i18n language names and rename language files. Closes #3051.

Kailash Nadhdf43884b907e
diff --git a/docs/i18n/index.html b/docs/i18n/index.html
index e45a573a..4ce22e4e 100644
--- a/docs/i18n/index.html
+++ b/docs/i18n/index.html
@@ -41,15 +41,15 @@
<select v-model="loadLang" @change="onLoadLanguage">
<option value="en">Default (en)</option>
<option value="ca"> Català (ca) </option>
- <option value="cs-cz"> čeština (cs) </option>
+ <option value="cs"> čeština (cs) </option>
<option value="cy"> Cymraeg (cy) </option>
<option value="de"> Deutsch (de) </option>
<option value="es"> Español (es) </option>
<option value="fi"> Suomi (fi) </option>
<option value="fr"> Français (fr) </option>
- <option value="hu"> Hungary (hu) </option>
+ <option value="hu"> Magyar (hu) </option>
<option value="it"> Italiano (it) </option>
- <option value="jp"> 日本語 (jp) </option>
+ <option value="ja"> 日本語 (ja) </option>
<option value="ml"> മലയാളം (ml) </option>
<option value="nl"> Nederlands (nl) </option>
<option value="pl"> Polski (pl) </option>
@@ -57,7 +57,7 @@
<option value="pt-BR"> Português Brasileiro (pt-BR) </option>
<option value="ro"> Română (ro) </option>
<option value="ru"> Русский (ru) </option>
- <option value="se"> Svenska (se) </option>
+ <option value="sv"> Svenska (sv) </option>
<option value="sk"> slovenčina (sk) </option>
<option value="tr"> Turkish (tr) </option>
<option value="vi"> Vietnamese (vi) </option>
@@ -103,4 +103,4 @@
<script src="vue.min.js"></script>
<script src="main.js"></script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/frontend/src/components/RichtextEditor.vue b/frontend/src/components/RichtextEditor.vue
index 72faa112..e9ccf234 100644
--- a/frontend/src/components/RichtextEditor.vue
+++ b/frontend/src/components/RichtextEditor.vue
@@ -89,7 +89,7 @@ import Media from '../views/Media.vue';
// Map of listmonk language codes to corresponding TinyMCE language files.
const LANGS = {
- 'cs-cz': 'cs',
+ cs: 'cs',
de: 'de',
es: 'es_419',
fr: 'fr_FR',
diff --git a/i18n/cs-cz.json b/i18n/cs.json
similarity index 99%
rename from i18n/cs-cz.json
rename to i18n/cs.json
index 5cc5e8e5..ff276db6 100644
--- a/i18n/cs-cz.json
+++ b/i18n/cs.json
@@ -1,5 +1,5 @@
{
- "_.code": "cs-cz",
+ "_.code": "cs",
"_.name": "Čeština (cs)",
"admin.errorMarshallingConfig": "Chyba při serializaci konfigurace: {error}",
"analytics.count": "Počet",
diff --git a/i18n/jp.json b/i18n/ja.json
similarity index 99%
rename from i18n/jp.json
rename to i18n/ja.json
index 5cc0a562..7f35e60b 100644
--- a/i18n/jp.json
+++ b/i18n/ja.json
@@ -1,6 +1,6 @@
{
- "_.code": "jp",
- "_.name": "日本語 (jp)",
+ "_.code": "ja",
+ "_.name": "日本語 (ja)",
"admin.errorMarshallingConfig": "マーシャリングコンフィグエラー: {error}",
"analytics.count": "カウント",
"analytics.fromDate": "から",
diff --git a/i18n/se.json b/i18n/sv.json
similarity index 99%
rename from i18n/se.json
rename to i18n/sv.json
index 0be6e6b9..e209af3a 100644
--- a/i18n/se.json
+++ b/i18n/sv.json
@@ -1,6 +1,6 @@
{
- "_.code": "se",
- "_.name": "Svenska (se)",
+ "_.code": "sv",
+ "_.name": "Svenska (sv)",
"admin.errorMarshallingConfig": "Fel vid kodning av konfigurationen: {error}",
"analytics.count": "Antal",
"analytics.fromDate": "Från",
diff --git a/internal/migrations/v6.2.0.go b/internal/migrations/v6.2.0.go
index e995dbc2..4ef41a9e 100644
--- a/internal/migrations/v6.2.0.go
+++ b/internal/migrations/v6.2.0.go
@@ -27,5 +27,18 @@ func V6_2_0(db *sqlx.DB, fs stuffbin.FileSystem, ko *koanf.Koanf, lo *log.Logger
return err
}
+ // Update app language settings that used incorrect locale codes.
+ if _, err := db.Exec(`
+ UPDATE settings SET value = langs.new_value
+ FROM (VALUES
+ ('"cs-cz"'::JSONB, '"cs"'::JSONB),
+ ('"jp"'::JSONB, '"ja"'::JSONB),
+ ('"se"'::JSONB, '"sv"'::JSONB)
+ ) AS langs(old_value, new_value)
+ WHERE key = 'app.lang' AND value = langs.old_value;
+ `); err != nil {
+ return err
+ }
+
return nil
}
diff --git a/project.inlang.json b/project.inlang.json
index 41e22172..3f3e6900 100644
--- a/project.inlang.json
+++ b/project.inlang.json
@@ -1,7 +1,7 @@
{
"$schema":"https://inlang.com/schema/project-settings",
"sourceLanguageTag": "en",
- "languageTags": ["ca", "cs-cz", "cy", "de", "en", "es", "fi", "fr", "hu", "it", "jp", "ml", "nl", "pl", "pt-BR", "pt", "ro", "ru", "se", "sk", "tr", "vi", "zh-CN", "zh-TW"],
+ "languageTags": ["ca", "cs", "cy", "de", "en", "es", "fi", "fr", "hu", "it", "ja", "ml", "nl", "pl", "pt-BR", "pt", "ro", "ru", "sk", "sv", "tr", "vi", "zh-CN", "zh-TW"],
"modules": [
"https://cdn.jsdelivr.net/npm/@inlang/plugin-json@4/dist/index.js",
"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@1/dist/index.js",