From 0e0b0c80953d8f2757764b458e1304804d90bd70 Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Wed, 24 Apr 2024 23:41:40 +0300 Subject: [PATCH 1/9] chore: remove language names from translations (#3140) --------- Signed-off-by: Sergey Ponomarev --- .../src/components/settings/Languages.vue | 50 +++++++++---------- frontend/src/i18n/ar.json | 26 ---------- frontend/src/i18n/de.json | 26 ---------- frontend/src/i18n/el.json | 26 ---------- frontend/src/i18n/en.json | 26 ---------- frontend/src/i18n/es.json | 25 ---------- frontend/src/i18n/fr.json | 26 ---------- frontend/src/i18n/he.json | 26 ---------- frontend/src/i18n/hu.json | 26 ---------- frontend/src/i18n/is.json | 26 ---------- frontend/src/i18n/it.json | 26 ---------- frontend/src/i18n/ja.json | 26 ---------- frontend/src/i18n/ko.json | 26 ---------- frontend/src/i18n/nl-be.json | 26 ---------- frontend/src/i18n/pl.json | 26 ---------- frontend/src/i18n/pt-br.json | 26 ---------- frontend/src/i18n/pt.json | 26 ---------- frontend/src/i18n/ro.json | 26 ---------- frontend/src/i18n/ru.json | 26 ---------- frontend/src/i18n/sk.json | 26 ---------- frontend/src/i18n/sv-se.json | 26 ---------- frontend/src/i18n/tr.json | 26 ---------- frontend/src/i18n/uk.json | 26 ---------- frontend/src/i18n/zh-cn.json | 26 ---------- frontend/src/i18n/zh-tw.json | 26 ---------- frontend/src/views/settings/Global.vue | 2 +- 26 files changed, 26 insertions(+), 649 deletions(-) diff --git a/frontend/src/components/settings/Languages.vue b/frontend/src/components/settings/Languages.vue index 575c8a11..992a50c8 100644 --- a/frontend/src/components/settings/Languages.vue +++ b/frontend/src/components/settings/Languages.vue @@ -1,7 +1,7 @@ @@ -15,30 +15,30 @@ export default { data() { let dataObj = {}; const locales = { - he: "he", - hu: "hu", - ar: "ar", - de: "de", - el: "el", - en: "en", - es: "es", - fr: "fr", - is: "is", - it: "it", - ja: "ja", - ko: "ko", - "nl-be": "nlBE", - pl: "pl", - "pt-br": "ptBR", - pt: "pt", - ro: "ro", - ru: "ru", - sk: "sk", - "sv-se": "svSE", - tr: "tr", - uk: "uk", - "zh-cn": "zhCN", - "zh-tw": "zhTW", + he: "עברית", + hu: "Magyar", + ar: "العربية", + de: "Deutsch", + el: "Ελληνικά", + en: "English", + es: "Español", + fr: "Français", + is: "Icelandic", + it: "Italiano", + ja: "日本語", + ko: "한국어", + "nl-be": "Dutch (Belgium)", + pl: "Polski", + "pt-br": "Português", + pt: "Português (Brasil)", + ro: "Romanian", + ru: "Русский", + sk: "Slovenčina", + "sv-se": "Swedish (Sweden)", + tr: "Türkçe", + uk: "Українська", + "zh-cn": "中文 (简体)", + "zh-tw": "中文 (繁體)", }; // Vue3 reactivity breaks with this configuration diff --git a/frontend/src/i18n/ar.json b/frontend/src/i18n/ar.json index 5014eb52..0236a9f3 100644 --- a/frontend/src/i18n/ar.json +++ b/frontend/src/i18n/ar.json @@ -89,32 +89,6 @@ "f2": "إعادة تسمية الملف", "help": "مساعدة" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "ua": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "إنشاء حساب جديد", "loginInstead": "هل لديك حساب", diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json index 602dfdcc..2609a5f3 100644 --- a/frontend/src/i18n/de.json +++ b/frontend/src/i18n/de.json @@ -82,32 +82,6 @@ "f2": "Datei umbenennen", "help": "Hilfe" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Account erstellen", "loginInstead": "Account besteht bereits", diff --git a/frontend/src/i18n/el.json b/frontend/src/i18n/el.json index 8d79d924..54a18ac0 100644 --- a/frontend/src/i18n/el.json +++ b/frontend/src/i18n/el.json @@ -85,32 +85,6 @@ "f2": "μετονομασία αρχείου", "help": "Βοήθεια" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "en": "English", - "es": "Español", - "el": "Ελληνικά", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "ua": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Δημιουργία λογαριασμού", "loginInstead": "Έχετε ήδη λογαριασμό", diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index 499e474c..00d43b9d 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -89,32 +89,6 @@ "f2": "rename file", "help": "Help" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Create an account", "loginInstead": "Already have an account", diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json index a0015ced..06197a79 100644 --- a/frontend/src/i18n/es.json +++ b/frontend/src/i18n/es.json @@ -83,31 +83,6 @@ "f2": "renombrar archivo", "help": "Ayuda" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Niederländisch (Belgien)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Românesc", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Crear una cuenta", "loginInstead": "Usuario ya existente", diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json index 0578c7fc..30725641 100644 --- a/frontend/src/i18n/fr.json +++ b/frontend/src/i18n/fr.json @@ -85,32 +85,6 @@ "f2": "Renommer le fichier", "help": "Aide" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Créer un compte", "loginInstead": "Vous avez déjà un compte", diff --git a/frontend/src/i18n/he.json b/frontend/src/i18n/he.json index 98c768f0..ef369deb 100644 --- a/frontend/src/i18n/he.json +++ b/frontend/src/i18n/he.json @@ -89,32 +89,6 @@ "f2": "שינוי שם קובץ", "help": "עזרה" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "צור חשבון", "loginInstead": "כבר יש לי חשבון", diff --git a/frontend/src/i18n/hu.json b/frontend/src/i18n/hu.json index 34bbe862..6212984d 100644 --- a/frontend/src/i18n/hu.json +++ b/frontend/src/i18n/hu.json @@ -82,32 +82,6 @@ "f2": "fájl átnevezése", "help": "Súgó" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Fiók létrehozása", "loginInstead": "Már van fiókom", diff --git a/frontend/src/i18n/is.json b/frontend/src/i18n/is.json index 6cc6af1d..d53874c8 100644 --- a/frontend/src/i18n/is.json +++ b/frontend/src/i18n/is.json @@ -76,32 +76,6 @@ "f2": "endurnefna skjal", "help": "Hjálp" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Búa til nýjan aðgang", "loginInstead": "Þú ert þegar með aðgang", diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json index 5e5291a7..a03c7f42 100644 --- a/frontend/src/i18n/it.json +++ b/frontend/src/i18n/it.json @@ -77,32 +77,6 @@ "f2": "rinomina un file", "help": "Aiuto" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Crea un account", "loginInstead": "Hai già un account", diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json index d69e9334..f16a9d16 100644 --- a/frontend/src/i18n/ja.json +++ b/frontend/src/i18n/ja.json @@ -88,32 +88,6 @@ "f2": "ファイルの名前を変更", "help": "ヘルプ" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "アカウントを作成", "loginInstead": "ログインする", diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json index 4924d8ca..046a712b 100644 --- a/frontend/src/i18n/ko.json +++ b/frontend/src/i18n/ko.json @@ -76,32 +76,6 @@ "f2": "파일 이름 변경", "help": "도움말" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "계정 생성", "loginInstead": "이미 계정이 있습니다", diff --git a/frontend/src/i18n/nl-be.json b/frontend/src/i18n/nl-be.json index 9147acac..913e48f0 100644 --- a/frontend/src/i18n/nl-be.json +++ b/frontend/src/i18n/nl-be.json @@ -76,32 +76,6 @@ "f2": "bestand herbenoemen", "help": "Help" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Account aanmaken", "loginInstead": "Heeft al een account", diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json index 8f7eb72d..9fcd4afa 100644 --- a/frontend/src/i18n/pl.json +++ b/frontend/src/i18n/pl.json @@ -76,32 +76,6 @@ "f2": "zmień nazwę pliku", "help": "Pomoc" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Utwórz konto", "loginInstead": "Takie konto już istnieje", diff --git a/frontend/src/i18n/pt-br.json b/frontend/src/i18n/pt-br.json index ae9c7bdb..53d855d1 100644 --- a/frontend/src/i18n/pt-br.json +++ b/frontend/src/i18n/pt-br.json @@ -83,32 +83,6 @@ "f2": "renomear arquivo", "help": "Ajuda" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Criar uma conta", "loginInstead": "Já possui uma conta", diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json index 7b7d14e4..e7cd9efa 100644 --- a/frontend/src/i18n/pt.json +++ b/frontend/src/i18n/pt.json @@ -77,32 +77,6 @@ "f2": "alterar nome do ficheiro", "help": "Ajuda" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Criar uma conta", "loginInstead": "Já tenho uma conta", diff --git a/frontend/src/i18n/ro.json b/frontend/src/i18n/ro.json index f580eec2..6d564461 100644 --- a/frontend/src/i18n/ro.json +++ b/frontend/src/i18n/ro.json @@ -76,32 +76,6 @@ "f2": "redenumește fișierul", "help": "Ajutor" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Crează cont", "loginInstead": "Am deja cont", diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json index 35c06a39..bb6e8c92 100644 --- a/frontend/src/i18n/ru.json +++ b/frontend/src/i18n/ru.json @@ -82,32 +82,6 @@ "f2": "переименовать файл", "help": "Помощь" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Создать аккаунт", "loginInstead": "Уже есть аккаунт", diff --git a/frontend/src/i18n/sk.json b/frontend/src/i18n/sk.json index 8243b40c..5408b42a 100644 --- a/frontend/src/i18n/sk.json +++ b/frontend/src/i18n/sk.json @@ -82,32 +82,6 @@ "f2": "premenuje súbor", "help": "Pomoc" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Vytvoriť účet", "loginInstead": "Už mám účet", diff --git a/frontend/src/i18n/sv-se.json b/frontend/src/i18n/sv-se.json index 4a7bd5fc..d6bb1676 100644 --- a/frontend/src/i18n/sv-se.json +++ b/frontend/src/i18n/sv-se.json @@ -76,32 +76,6 @@ "f2": "ändra namnet på filen", "help": "Hjälp" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Skapa ett konto", "loginInstead": "Du har redan ett konto", diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json index b8cd6446..ef8a93b0 100644 --- a/frontend/src/i18n/tr.json +++ b/frontend/src/i18n/tr.json @@ -80,32 +80,6 @@ "f2": "dosyayı yeniden adlandır", "help": "Yardım" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Bir hesap oluşturun", "loginInstead": "Zaten hesabınız var mı", diff --git a/frontend/src/i18n/uk.json b/frontend/src/i18n/uk.json index dceac2a2..b95a99c3 100644 --- a/frontend/src/i18n/uk.json +++ b/frontend/src/i18n/uk.json @@ -82,32 +82,6 @@ "f2": "перейменувати файл", "help": "Допомога" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "Створити обліковий запис", "loginInstead": "Вже є обліковий запис", diff --git a/frontend/src/i18n/zh-cn.json b/frontend/src/i18n/zh-cn.json index c0397b0f..51801a59 100644 --- a/frontend/src/i18n/zh-cn.json +++ b/frontend/src/i18n/zh-cn.json @@ -87,32 +87,6 @@ "f2": "重命名文件/文件夹", "help": "帮助" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "创建用户", "loginInstead": "已有用户登录", diff --git a/frontend/src/i18n/zh-tw.json b/frontend/src/i18n/zh-tw.json index 43ad20ee..26da1978 100644 --- a/frontend/src/i18n/zh-tw.json +++ b/frontend/src/i18n/zh-tw.json @@ -76,32 +76,6 @@ "f2": "重新命名檔案/資料夾", "help": "幫助" }, - "languages": { - "he": "עברית", - "hu": "Magyar", - "ar": "العربية", - "de": "Deutsch", - "el": "Ελληνικά", - "en": "English", - "es": "Español", - "fr": "Français", - "is": "Icelandic", - "it": "Italiano", - "ja": "日本語", - "ko": "한국어", - "nlBE": "Dutch (Belgium)", - "pl": "Polski", - "pt": "Português", - "ptBR": "Português (Brasil)", - "ro": "Romanian", - "ru": "Русский", - "sk": "Slovenčina", - "svSE": "Swedish (Sweden)", - "tr": "Türkçe", - "uk": "Українська", - "zhCN": "中文 (简体)", - "zhTW": "中文 (繁體)" - }, "login": { "createAnAccount": "新建賬戶", "loginInstead": "已有賬戶登錄", diff --git a/frontend/src/views/settings/Global.vue b/frontend/src/views/settings/Global.vue index 05783281..40a3ec04 100644 --- a/frontend/src/views/settings/Global.vue +++ b/frontend/src/views/settings/Global.vue @@ -71,7 +71,7 @@ {{ t("settings.disableUsedDiskPercentage") }}

From e39ea73095e807e44ffce274e509e3a5ace204d8 Mon Sep 17 00:00:00 2001 From: Oleg Lobanov Date: Wed, 24 Apr 2024 22:51:37 +0200 Subject: [PATCH 2/9] ci: add pr lint workflow (#3157) --- .github/workflows/main.yaml | 12 +----------- .github/workflows/pr-lint.yaml | 21 +++++++++++++++++++++ Makefile | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/pr-lint.yaml diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index bc1ce06b..1298b1ff 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -26,19 +26,9 @@ jobs: with: go-version: 1.22.1 - run: make lint-backend - lint-commits: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: actions/setup-node@v4 - with: - node-version: '18' - - run: make lint-commits lint: runs-on: ubuntu-latest - needs: [lint-frontend, lint-backend, lint-commits] + needs: [lint-frontend, lint-backend] steps: - run: echo "done" diff --git a/.github/workflows/pr-lint.yaml b/.github/workflows/pr-lint.yaml new file mode 100644 index 00000000..34ecbb09 --- /dev/null +++ b/.github/workflows/pr-lint.yaml @@ -0,0 +1,21 @@ +name: "Lint PR" + +on: + pull_request_target: + types: + - opened + - reopened + - edited + - synchronize + +permissions: + pull-requests: read + +jobs: + main: + name: Validate PR title + runs-on: ubuntu-latest + steps: + - uses: amannn/action-semantic-pull-request@v5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/Makefile b/Makefile index 743dafe8..baecd0f3 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ test-backend: ## Run backend tests $Q $(go) test -v ./... .PHONY: lint -lint: lint-frontend lint-backend lint-commits ## Run all linters +lint: lint-frontend lint-backend ## Run all linters .PHONY: lint-frontend lint-frontend: ## Run frontend linters From 6b77b8d683f7357ef71af678550e78910c10ddeb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 23:02:21 +0200 Subject: [PATCH 3/9] build(deps): bump golang.org/x/net from 0.22.0 to 0.23.0 (#3133) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 864b4d61..18bd5895 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect - golang.org/x/net v0.22.0 // indirect + golang.org/x/net v0.23.0 // indirect golang.org/x/sys v0.18.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/go.sum b/go.sum index 200b6a59..8287feff 100644 --- a/go.sum +++ b/go.sum @@ -203,8 +203,8 @@ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From a9da7fd56c849b5a13133136b35ef5ebee622962 Mon Sep 17 00:00:00 2001 From: Oleg Lobanov Date: Wed, 24 Apr 2024 23:08:12 +0200 Subject: [PATCH 4/9] build: bump go version to 1.22.2 (#3158) --- .github/workflows/main.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1298b1ff..fea021fa 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.22.1 + go-version: 1.22.2 - run: make lint-backend lint: runs-on: ubuntu-latest @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.22.1 + go-version: 1.22.2 - run: make test-backend test: runs-on: ubuntu-latest @@ -66,7 +66,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v5 with: - go-version: 1.22.1 + go-version: 1.22.2 - uses: actions/setup-node@v4 with: node-version: '18' From 8fd6c55a0ec4062d180e3224f05d840797017a68 Mon Sep 17 00:00:00 2001 From: Oleg Lobanov Date: Wed, 24 Apr 2024 23:09:55 +0200 Subject: [PATCH 5/9] ci: refactor pr-lint workflow --- .github/workflows/pr-lint.yaml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-lint.yaml b/.github/workflows/pr-lint.yaml index 34ecbb09..45497508 100644 --- a/.github/workflows/pr-lint.yaml +++ b/.github/workflows/pr-lint.yaml @@ -17,5 +17,30 @@ jobs: runs-on: ubuntu-latest steps: - uses: amannn/action-semantic-pull-request@v5 + id: lint_pr_title env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - uses: marocchino/sticky-pull-request-comment@v2 + # When the previous steps fails, the workflow would stop. By adding this + # condition you can continue the execution with the populated error message. + if: always() && (steps.lint_pr_title.outputs.error_message != null) + with: + header: pr-title-lint-error + message: | + Hey there and thank you for opening this pull request! 👋🏼 + + We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted. + + Details: + + ``` + ${{ steps.lint_pr_title.outputs.error_message }} + ``` + + # Delete a previous comment when the issue has been resolved + - if: ${{ steps.lint_pr_title.outputs.error_message == null }} + uses: marocchino/sticky-pull-request-comment@v2 + with: + header: pr-title-lint-error + delete: true \ No newline at end of file From b4b4b0efc974c167b611865fea74f75e92cf356c Mon Sep 17 00:00:00 2001 From: Oleg Lobanov Date: Wed, 24 Apr 2024 23:10:41 +0200 Subject: [PATCH 6/9] ci: fix permission for pr-lint --- .github/workflows/pr-lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-lint.yaml b/.github/workflows/pr-lint.yaml index 45497508..f2878cf2 100644 --- a/.github/workflows/pr-lint.yaml +++ b/.github/workflows/pr-lint.yaml @@ -9,7 +9,7 @@ on: - synchronize permissions: - pull-requests: read + pull-requests: write jobs: main: From 22a05e1f02a083cf7b630e16873dad0de89b7854 Mon Sep 17 00:00:00 2001 From: trmdi Date: Thu, 25 Apr 2024 04:12:46 +0700 Subject: [PATCH 7/9] fix: correct list item selector (#3126) (#3147) --- frontend/src/css/_share.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/css/_share.css b/frontend/src/css/_share.css index 04034a32..7099101a 100644 --- a/frontend/src/css/_share.css +++ b/frontend/src/css/_share.css @@ -68,11 +68,11 @@ border-top: 1px solid var(--borderPrimary); } -.share__box__items #listing.list .item .name { +#listing.list .item .name { width: 50%; } -.share__box__items #listing.list .item .modified { +#listing.list .item .modified { width: 25%; } From 18f04a7d26186927f51f46354f3b2164a68f1b41 Mon Sep 17 00:00:00 2001 From: Andrew Kennedy Date: Wed, 24 Apr 2024 14:13:56 -0700 Subject: [PATCH 8/9] fix: handle quotes in healthcheck.sh (#3130) This file as is makes a value of `"localhost"` as the address in the .filebrowser.json file read in as `"localhost"` instead of `localhost`. These quotes break the curl command. Using `-r` with jq fixes this. --- healthcheck.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/healthcheck.sh b/healthcheck.sh index cea8a1cb..b8b50039 100644 --- a/healthcheck.sh +++ b/healthcheck.sh @@ -1,5 +1,5 @@ #!/bin/sh -PORT=${FB_PORT:-$(jq .port /.filebrowser.json)} -ADDRESS=${FB_ADDRESS:-$(jq .address /.filebrowser.json)} +PORT=${FB_PORT:-$(jq -r .port /.filebrowser.json)} +ADDRESS=${FB_ADDRESS:-$(jq -r .address /.filebrowser.json)} ADDRESS=${ADDRESS:-localhost} curl -f http://$ADDRESS:$PORT/health || exit 1 From 61f25086c3d75f4fcf44ec97f53bb63081fc0865 Mon Sep 17 00:00:00 2001 From: loselarry <166403105+loselarry@users.noreply.github.com> Date: Thu, 25 Apr 2024 05:15:18 +0800 Subject: [PATCH 9/9] chore: fix some typos in comments (#3108) Signed-off-by: loselarry --- cmd/users_import.go | 4 ++-- frontend/src/utils/clipboard.ts | 2 +- frontend/src/utils/upload.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/users_import.go b/cmd/users_import.go index f0e1a513..dee9d759 100644 --- a/cmd/users_import.go +++ b/cmd/users_import.go @@ -60,7 +60,7 @@ list or set it to 0.`, // User exists in DB. if err == nil { if !overwrite { - checkErr(errors.New("user " + strconv.Itoa(int(user.ID)) + " is already registred")) + checkErr(errors.New("user " + strconv.Itoa(int(user.ID)) + " is already registered")) } // If the usernames mismatch, check if there is another one in the DB @@ -84,6 +84,6 @@ list or set it to 0.`, } func usernameConflictError(username string, originalID, newID uint) error { - return fmt.Errorf(`can't import user with ID %d and username "%s" because the username is already registred with the user %d`, + return fmt.Errorf(`can't import user with ID %d and username "%s" because the username is already registered with the user %d`, newID, username, originalID) } diff --git a/frontend/src/utils/clipboard.ts b/frontend/src/utils/clipboard.ts index 352d9ae7..51851007 100644 --- a/frontend/src/utils/clipboard.ts +++ b/frontend/src/utils/clipboard.ts @@ -22,7 +22,7 @@ export function copy(text: string) { } }) .catch((e) => { - // Firefox doesnt support clipboard-write permission + // Firefox doesn't support clipboard-write permission if (navigator.userAgent.indexOf("Firefox") != -1) { navigator.clipboard.writeText(text).then(resolve).catch(reject); } else { diff --git a/frontend/src/utils/upload.ts b/frontend/src/utils/upload.ts index 806bc78f..e7ce8bec 100644 --- a/frontend/src/utils/upload.ts +++ b/frontend/src/utils/upload.ts @@ -35,7 +35,7 @@ export function scanFiles(dt: DataTransfer): Promise { const contents: UploadList = []; if (dt.items) { - // ts didnt like the for of loop even tho + // ts didn't like the for of loop even tho // it is the official example on MDN // for (const item of dt.items) { for (let i = 0; i < dt.items.length; i++) {