From 08a4c33c67fb5564f4230de58e9a089040e4b90a Mon Sep 17 00:00:00 2001 From: Ilja Date: Sat, 12 Mar 2022 19:43:12 +0100 Subject: Explain better what delete does in moderation menu --- src/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index 8eb7fcc6..ed54c84e 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -805,7 +805,7 @@ "disable_any_subscription": "Disallow following user at all", "quarantine": "Disallow user posts from federating", "delete_user": "Delete user", - "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone." + "delete_user_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?" }, "highlight": { "disabled": "No highlight", -- cgit v1.2.3-70-g09d2 From d815f984fb354da2262d6a6e55b281aad817cda2 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 17 Mar 2022 08:52:17 +0200 Subject: fix i18n errors related to @ symbol --- src/i18n/en.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index 76a871fb..f3401e61 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -502,14 +502,14 @@ "true": "yes" }, "virtual_scrolling": "Optimize timeline rendering", - "use_at_icon": "Display @ symbol as an icon instead of text", + "use_at_icon": "Display {'@'} symbol as an icon instead of text", "mention_link_display": "Display mention links", - "mention_link_display_short": "always as short names (e.g. @foo)", - "mention_link_display_full_for_remote": "as full names only for remote users (e.g. @foo@example.org)", - "mention_link_display_full": "always as full names (e.g. @foo@example.org)", + "mention_link_display_short": "always as short names (e.g. {'@'}foo)", + "mention_link_display_full_for_remote": "as full names only for remote users (e.g. {'@'}foo{'@'}example.org)", + "mention_link_display_full": "always as full names (e.g. {'@'}foo{'@'}example.org)", "mention_link_show_tooltip": "Show full user names as tooltip for remote users", "mention_link_show_avatar": "Show user avatar beside the link", - "mention_link_fade_domain": "Fade domains (e.g. @example.org in @foo@example.org)", + "mention_link_fade_domain": "Fade domains (e.g. {'@'}example.org in {'@'}foo{'@'}example.org)", "mention_link_bolden_you": "Highlight mention of you when you are mentioned", "fun": "Fun", "greentext": "Meme arrows", -- cgit v1.2.3-70-g09d2 From d524e983487edd45c2a6558878c21e78b9d1ff38 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 22 Mar 2022 20:42:29 +0200 Subject: fix capitalization (and localization of tooltips for scope icon) --- src/components/status/status.js | 8 +++----- src/components/status/status.vue | 2 +- src/i18n/en.json | 8 +++++++- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'src/i18n') diff --git a/src/components/status/status.js b/src/components/status/status.js index e54be241..088ddcc5 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -389,6 +389,9 @@ const Status = { }, threadShowing () { return this.controlledThreadDisplayStatus === 'showing' + }, + visibilityLocalized () { + return this.$i18n.t('general.scope_in_timeline.' + this.status.visibility) } }, methods: { @@ -478,11 +481,6 @@ const Status = { 'isSuspendable': function (val) { this.suspendable = val } - }, - filters: { - capitalize: function (str) { - return str.charAt(0).toUpperCase() + str.slice(1) - } } } diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 3f352f03..ceb5a95a 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -192,7 +192,7 @@ Date: Thu, 24 Mar 2022 19:27:33 -0400 Subject: Fix English translation of Shoutbox in features panel --- src/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index 76a871fb..d36e7acf 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -46,7 +46,7 @@ "processing": "Processing, you'll soon be asked to download your file" }, "features_panel": { - "chat": "Chat", + "shout": "Shoutbox", "pleroma_chat_messages": "Pleroma Chat", "gopher": "Gopher", "media_proxy": "Media proxy", -- cgit v1.2.3-70-g09d2 From 2dd75ca76cd36846e76d74fc2f4d5dcedfcc66d7 Mon Sep 17 00:00:00 2001 From: Ilja Date: Sat, 26 Mar 2022 12:05:25 +0100 Subject: Change translation key --- src/i18n/ca.json | 1 - src/i18n/de.json | 1 - src/i18n/en.json | 2 +- src/i18n/eo.json | 1 - src/i18n/es.json | 3 +-- src/i18n/eu.json | 3 +-- src/i18n/fi.json | 3 +-- src/i18n/fr.json | 3 +-- src/i18n/he.json | 3 +-- src/i18n/id.json | 3 +-- src/i18n/it.json | 1 - src/i18n/ja_easy.json | 3 +-- src/i18n/ja_pedantic.json | 3 +-- src/i18n/nb.json | 3 +-- src/i18n/nl.json | 1 - src/i18n/oc.json | 3 +-- src/i18n/pl.json | 3 +-- src/i18n/pt.json | 1 - src/i18n/ru.json | 3 +-- src/i18n/uk.json | 1 - src/i18n/vi.json | 3 +-- src/i18n/zh.json | 3 +-- src/i18n/zh_Hant.json | 1 - 23 files changed, 15 insertions(+), 37 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/ca.json b/src/i18n/ca.json index 74260143..5f2795a8 100644 --- a/src/i18n/ca.json +++ b/src/i18n/ca.json @@ -621,7 +621,6 @@ "disable_any_subscription": "Deshabilita completament seguir algú", "quarantine": "Deshabilita la federació a les entrades de les usuàries", "moderation": "Moderació", - "delete_user_confirmation": "Estàs completament segur/a? Aquesta acció no es pot desfer.", "revoke_admin": "Revoca l'Admin", "activate_account": "Activa el compte", "deactivate_account": "Desactiva el compte", diff --git a/src/i18n/de.json b/src/i18n/de.json index b6599594..4bf897ef 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -582,7 +582,6 @@ "statuses": "Beiträge", "admin_menu": { "sandbox": "Erzwinge Beiträge nur für Follower sichtbar zu sein", - "delete_user_confirmation": "Achtung! Diese Entscheidung kann nicht rückgängig gemacht werden! Trotzdem durchführen?", "grant_admin": "Administratorprivilegien gewähren", "delete_user": "Nutzer löschen", "strip_media": "Medien von Beiträgen entfernen", diff --git a/src/i18n/en.json b/src/i18n/en.json index ed54c84e..2dda7f9c 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -805,7 +805,7 @@ "disable_any_subscription": "Disallow following user at all", "quarantine": "Disallow user posts from federating", "delete_user": "Delete user", - "delete_user_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?" + "delete_user_data_and_deactivate_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?" }, "highlight": { "disabled": "No highlight", diff --git a/src/i18n/eo.json b/src/i18n/eo.json index 659b5960..3c401b30 100644 --- a/src/i18n/eo.json +++ b/src/i18n/eo.json @@ -606,7 +606,6 @@ "mention": "Mencio", "hidden": "Kaŝita", "admin_menu": { - "delete_user_confirmation": "Ĉu vi tute certas? Ĉi tiu ago ne estas malfarebla.", "delete_user": "Forigi uzanton", "quarantine": "Malpermesi federadon de afiŝoj de uzanto", "disable_any_subscription": "Malpermesi ĉian abonadon al uzanto", diff --git a/src/i18n/es.json b/src/i18n/es.json index eb9fc0a5..9887f007 100644 --- a/src/i18n/es.json +++ b/src/i18n/es.json @@ -731,8 +731,7 @@ "disable_remote_subscription": "No permitir que usuarios de instancias remotas te siga", "disable_any_subscription": "No permitir que ningún usuario te siga", "quarantine": "No permitir publicaciones de usuarios de instancias remotas", - "delete_user": "Eliminar usuario", - "delete_user_confirmation": "¿Estás completamente seguro? Esta acción no se puede deshacer." + "delete_user": "Eliminar usuario" }, "show_repeats": "Mostrar repetidos", "hide_repeats": "Ocultar repetidos", diff --git a/src/i18n/eu.json b/src/i18n/eu.json index 539ee1bd..4e6ea550 100644 --- a/src/i18n/eu.json +++ b/src/i18n/eu.json @@ -609,8 +609,7 @@ "disable_remote_subscription": "Ez utzi istantzia kanpoko erabiltzaileak zuri jarraitzea", "disable_any_subscription": "Ez utzi beste erabiltzaileak zuri jarraitzea", "quarantine": "Ez onartu mezuak beste instantzietatik", - "delete_user": "Erabiltzailea ezabatu", - "delete_user_confirmation": "Erabat ziur zaude? Ekintza hau ezin da desegin." + "delete_user": "Erabiltzailea ezabatu" } }, "user_profile": { diff --git a/src/i18n/fi.json b/src/i18n/fi.json index 7b5244cb..f8c3b4ae 100644 --- a/src/i18n/fi.json +++ b/src/i18n/fi.json @@ -620,8 +620,7 @@ "sandbox": "Pakota viestit vain seuraajille", "disable_remote_subscription": "Estä seuraaminen ulkopuolisilta sivuilta", "quarantine": "Estä käyttäjän viestin federoituminen", - "delete_user": "Poista käyttäjä", - "delete_user_confirmation": "Oletko aivan varma? Tätä ei voi kumota." + "delete_user": "Poista käyttäjä" }, "favorites": "Tykkäykset", "mention": "Mainitse", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index 6d3c75d1..fae7c7a2 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -659,8 +659,7 @@ "disable_remote_subscription": "Interdir de s'abonner a l'utilisateur depuis l'instance distante", "disable_any_subscription": "Interdir de s'abonner à l'utilisateur tout court", "quarantine": "Interdir les statuts de l'utilisateur à fédérer", - "delete_user": "Supprimer l'utilisateur", - "delete_user_confirmation": "Êtes-vous absolument-sûr⋅e ? Cette action ne peut être annulée." + "delete_user": "Supprimer l'utilisateur" }, "mention": "Mention", "hidden": "Caché", diff --git a/src/i18n/he.json b/src/i18n/he.json index b0c59a30..6c62acc4 100644 --- a/src/i18n/he.json +++ b/src/i18n/he.json @@ -347,8 +347,7 @@ "disable_remote_subscription": "אל תאפשר עקיבה של המשתמש מאינסטנס אחר", "disable_any_subscription": "אל תאפשר עקיבה של המשתמש בכלל", "quarantine": "אל תאפשר פדרציה של ההודעות של המשתמש", - "delete_user": "מחק משתמש", - "delete_user_confirmation": "בטוח? פעולה זו הינה בלתי הפיכה." + "delete_user": "מחק משתמש" } }, "user_profile": { diff --git a/src/i18n/id.json b/src/i18n/id.json index fd64b7ae..73cc2a71 100644 --- a/src/i18n/id.json +++ b/src/i18n/id.json @@ -327,8 +327,7 @@ "delete_account": "Hapus akun", "force_nsfw": "Tandai semua postingan sebagai NSFW", "strip_media": "Hapus media dari postingan-postingan", - "delete_user": "Hapus pengguna", - "delete_user_confirmation": "Apakah Anda benar-benar yakin? Tindakan ini tidak dapat dibatalkan." + "delete_user": "Hapus pengguna" }, "follow_unfollow": "Berhenti mengikuti", "followees": "Mengikuti", diff --git a/src/i18n/it.json b/src/i18n/it.json index a1ec37a2..c8c74b70 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -485,7 +485,6 @@ "deny": "Nega", "remote_follow": "Segui da remoto", "admin_menu": { - "delete_user_confirmation": "Ne sei completamente sicuro? Non potrai tornare indietro.", "delete_user": "Elimina utente", "quarantine": "I messaggi non arriveranno alle altre stanze", "disable_any_subscription": "Rendi utente non seguibile", diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json index f64943d9..abca262b 100644 --- a/src/i18n/ja_easy.json +++ b/src/i18n/ja_easy.json @@ -608,8 +608,7 @@ "disable_remote_subscription": "ほかのインスタンスからフォローされないようにする", "disable_any_subscription": "フォローされないようにする", "quarantine": "ほかのインスタンスのユーザーのとうこうをとめる", - "delete_user": "ユーザーをけす", - "delete_user_confirmation": "あなたは、ほんとうに、きはたしかですか？ これは、とりけすことが、できません。" + "delete_user": "ユーザーをけす" } }, "user_profile": { diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json index be334651..fddf24db 100644 --- a/src/i18n/ja_pedantic.json +++ b/src/i18n/ja_pedantic.json @@ -729,8 +729,7 @@ "disable_remote_subscription": "他のインスタンスからフォローされないようにする", "disable_any_subscription": "フォローされないようにする", "quarantine": "他のインスタンスからの投稿を止める", - "delete_user": "ユーザーを削除", - "delete_user_confirmation": "あなたの精神状態に何か問題はございませんか？ この操作を取り消すことはできません。" + "delete_user": "ユーザーを削除" }, "roles": { "moderator": "モデレーター", diff --git a/src/i18n/nb.json b/src/i18n/nb.json index 5e3e8ef3..1c160afb 100644 --- a/src/i18n/nb.json +++ b/src/i18n/nb.json @@ -553,8 +553,7 @@ "disable_remote_subscription": "Fjern mulighet til å følge brukeren fra andre instanser", "disable_any_subscription": "Fjern mulighet til å følge brukeren", "quarantine": "Gjør at statuser fra brukeren ikke kan sendes til andre instanser", - "delete_user": "Slett bruker", - "delete_user_confirmation": "Er du helt sikker? Denne handlingen kan ikke omgjøres." + "delete_user": "Slett bruker" } }, "user_profile": { diff --git a/src/i18n/nl.json b/src/i18n/nl.json index b113ffe4..5c00efc4 100644 --- a/src/i18n/nl.json +++ b/src/i18n/nl.json @@ -580,7 +580,6 @@ "remote_follow": "Volg vanop afstand", "statuses": "Statussen", "admin_menu": { - "delete_user_confirmation": "Weet je het heel zeker? Deze uitvoering kan niet ongedaan worden gemaakt.", "delete_user": "Gebruiker verwijderen", "quarantine": "Federeren van gebruikers berichten verbieden", "disable_any_subscription": "Volgen van gebruiker in zijn geheel verbieden", diff --git a/src/i18n/oc.json b/src/i18n/oc.json index 40f48149..556b3d0b 100644 --- a/src/i18n/oc.json +++ b/src/i18n/oc.json @@ -501,8 +501,7 @@ "disable_remote_subscription": "Desactivar lo seguiment d’utilizaire d’instàncias alonhadas", "disable_any_subscription": "Desactivar tot seguiment", "quarantine": "Defendre la federacion de las publicacions de l’utilizaire", - "delete_user": "Suprimir l’utilizaire", - "delete_user_confirmation": "Volètz vertadièrament far aquò ? Aquesta accion se pòt pas anullar." + "delete_user": "Suprimir l’utilizaire" } }, "user_profile": { diff --git a/src/i18n/pl.json b/src/i18n/pl.json index 304a0349..efebcc83 100644 --- a/src/i18n/pl.json +++ b/src/i18n/pl.json @@ -762,8 +762,7 @@ "disable_remote_subscription": "Zakaż obserwowania użytkownika ze zdalnych instancji", "disable_any_subscription": "Zakaż całkowicie obserwowania użytkownika", "quarantine": "Zakaż federowania postów od tego użytkownika", - "delete_user": "Usuń użytkownika", - "delete_user_confirmation": "Czy jesteś absolutnie pewny(-a)? Ta operacja nie może być cofnięta." + "delete_user": "Usuń użytkownika" }, "message": "Napisz", "edit_profile": "Edytuj profil", diff --git a/src/i18n/pt.json b/src/i18n/pt.json index e32a95e4..b997701c 100644 --- a/src/i18n/pt.json +++ b/src/i18n/pt.json @@ -594,7 +594,6 @@ "unmute_progress": "A retirar silêncio…", "mute_progress": "A silenciar…", "admin_menu": { - "delete_user_confirmation": "Tens a certeza? Esta ação não pode ser revertida.", "delete_user": "Eliminar utilizador", "quarantine": "Não permitir publicações de utilizadores de instâncias remotas", "disable_any_subscription": "Não permitir que nenhum utilizador te siga", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index ba0cec28..7e6ff3f5 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -576,8 +576,7 @@ "disable_remote_subscription": "Запретить читать с других узлов", "disable_any_subscription": "Запретить читать пользователя", "quarantine": "Не федерировать статусы пользователя", - "delete_user": "Удалить пользователя", - "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить." + "delete_user": "Удалить пользователя" }, "media": "С вложениями", "mention": "Упомянуть", diff --git a/src/i18n/uk.json b/src/i18n/uk.json index d9833087..4e62b4a9 100644 --- a/src/i18n/uk.json +++ b/src/i18n/uk.json @@ -755,7 +755,6 @@ "deactivate_account": "Деактивувати обліковий запис", "delete_account": "Видалити обліковий запис", "moderation": "Модерація", - "delete_user_confirmation": "Ви абсолютно впевнені? Цю дію неможливо буде скасовувати.", "delete_user": "Видалити обліковий запис", "strip_media": "Вилучити медіа з дописів користувача", "force_nsfw": "Позначити всі дописи як NSFW", diff --git a/src/i18n/vi.json b/src/i18n/vi.json index c77ad4ca..fd7ae25c 100644 --- a/src/i18n/vi.json +++ b/src/i18n/vi.json @@ -772,8 +772,7 @@ "quarantine": "Không cho phép tút liên hợp", "delete_user": "Xóa người dùng", "revoke_moderator": "Gỡ bỏ Quản trị viên", - "force_unlisted": "Đánh dấu tất cả tút là hạn chế", - "delete_user_confirmation": "Bạn chắc chắn chưa? Hành động này không thể phục hồi." + "force_unlisted": "Đánh dấu tất cả tút là hạn chế" }, "highlight": { "disabled": "Không nổi bật", diff --git a/src/i18n/zh.json b/src/i18n/zh.json index abba4be9..dd0e6827 100644 --- a/src/i18n/zh.json +++ b/src/i18n/zh.json @@ -714,8 +714,7 @@ "disable_remote_subscription": "禁止从远程实例关注用户", "disable_any_subscription": "完全禁止关注用户", "quarantine": "从联合实例中禁止用户帖子", - "delete_user": "删除用户", - "delete_user_confirmation": "你确定吗？此操作无法撤销。" + "delete_user": "删除用户" }, "hidden": "已隐藏", "show_repeats": "显示转发", diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json index 2c4dc3fb..6f0f63b5 100644 --- a/src/i18n/zh_Hant.json +++ b/src/i18n/zh_Hant.json @@ -747,7 +747,6 @@ "admin_menu": { "delete_account": "刪除賬號", "delete_user": "刪除用戶", - "delete_user_confirmation": "你確認嗎？此操作無法撤銷。", "moderation": "調停", "grant_admin": "賦予管理權限", "revoke_admin": "撤銷管理權限", -- cgit v1.2.3-70-g09d2 From bd77f3a1a6b341612949cd28237a4efbd2ce2bb4 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 6 Apr 2022 15:45:44 +0300 Subject: fix i18n for good?? --- build/webpack.base.conf.js | 17 +++++++++-------- src/i18n/messages.js | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'src/i18n') diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index f8bd9902..f8c544d7 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -59,6 +59,15 @@ module.exports = { } } }, + { + enforce: 'post', + test: /\.(json5?|ya?ml)$/, // target json, json5, yaml and yml files + type: 'javascript/auto', + loader: '@intlify/vue-i18n-loader', + include: [ // Use `Rule.include` to specify the files of locale messages to be pre-compiled + path.resolve(__dirname, '../src/i18n') + ] + }, { test: /\.vue$/, loader: 'vue-loader', @@ -99,14 +108,6 @@ module.exports = { } } }, - { - test: /\.(json5?|ya?ml)$/, // target json, json5, yaml and yml files - type: 'javascript/auto', - loader: '@intlify/vue-i18n-loader', - include: [ // Use `Rule.include` to specify the files of locale messages to be pre-compiled - path.resolve(__dirname, 'src/i18n') - ] - }, ] }, plugins: [ diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 2a1161be..c5997230 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -32,7 +32,7 @@ const loaders = { pt: () => import('./pt.json'), ro: () => import('./ro.json'), ru: () => import('./ru.json'), - te: () => import('./te.json'), + //te: () => import('./te.json'), // buggy uk: () => import('./uk.json'), zh: () => import('./zh.json'), zh_Hant: () => import('./zh_Hant.json') @@ -41,12 +41,12 @@ const loaders = { const messages = { languages: ['en', ...Object.keys(loaders)], default: { - en: require('./en.json') + en: require('./en.json').default }, setLanguage: async (i18n, language) => { if (loaders[language]) { let messages = await loaders[language]() - i18n.setLocaleMessage(language, messages) + i18n.setLocaleMessage(language, messages.default) } i18n.locale = language } -- cgit v1.2.3-70-g09d2 From b213d25711efdbf275c5092fbc3983792476eec9 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 6 Apr 2022 15:47:52 +0300 Subject: heck --- src/i18n/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index c5997230..869eaec4 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -32,7 +32,7 @@ const loaders = { pt: () => import('./pt.json'), ro: () => import('./ro.json'), ru: () => import('./ru.json'), - //te: () => import('./te.json'), // buggy + // te: () => import('./te.json'), // buggy uk: () => import('./uk.json'), zh: () => import('./zh.json'), zh_Hant: () => import('./zh_Hant.json') -- cgit v1.2.3-70-g09d2 From 853f5145be2296911862a845d45fbb0242a62ade Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 6 Apr 2022 18:43:47 +0300 Subject: fix tegulu --- src/i18n/messages.js | 2 +- src/i18n/te.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 869eaec4..977b8eb3 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -32,7 +32,7 @@ const loaders = { pt: () => import('./pt.json'), ro: () => import('./ro.json'), ru: () => import('./ru.json'), - // te: () => import('./te.json'), // buggy + te: () => import('./te.json'), uk: () => import('./uk.json'), zh: () => import('./zh.json'), zh_Hant: () => import('./zh_Hant.json') diff --git a/src/i18n/te.json b/src/i18n/te.json index 1216de59..4f255505 100644 --- a/src/i18n/te.json +++ b/src/i18n/te.json @@ -49,7 +49,7 @@ "notifications.repeated_you": "మీ స్థితిని పునరావృతం చేసారు", "notifications.no_more_notifications": "ఇక నోటిఫికేషన్లు లేవు", "post_status.new_status": "క్రొత్త స్థితిని పోస్ట్ చేయండి", - "post_status.account_not_locked_warning": "మీ ఖాతా {౦} కాదు. ఎవరైనా మిమ్మల్ని అనుసరించి అనుచరులకు మాత్రమే ఉద్దేశించిన పోస్టులను చూడవచ్చు.", + "post_status.account_not_locked_warning": "మీ ఖాతా {0} కాదు. ఎవరైనా మిమ్మల్ని అనుసరించి అనుచరులకు మాత్రమే ఉద్దేశించిన పోస్టులను చూడవచ్చు.", "post_status.account_not_locked_warning_link": "తాళం వేయబడినది", "post_status.attachments_sensitive": "జోడింపులను సున్నితమైనవిగా గుర్తించండి", "post_status.content_type.text/plain": "సాధారణ అక్షరాలు", -- cgit v1.2.3-70-g09d2 From 28556f7c277ea96ac7216e019f448480108fba5d Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 12 Apr 2022 22:01:04 +0300 Subject: localization updates --- src/components/settings_modal/tabs/general_tab.js | 2 +- src/i18n/en.json | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/i18n') diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js index 89505cb3..c97b3410 100644 --- a/src/components/settings_modal/tabs/general_tab.js +++ b/src/components/settings_modal/tabs/general_tab.js @@ -41,7 +41,7 @@ const GeneralTab = { thirdColumnModeOptions: ['none', 'notifications', 'postform'].map(mode => ({ key: mode, value: mode, - label: this.$t(`settings.conversation_display_${mode}`) + label: this.$t(`settings.third_column_mode_${mode}`) })), loopSilentAvailable: // Firefox diff --git a/src/i18n/en.json b/src/i18n/en.json index f8336e5c..d04df325 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -367,7 +367,7 @@ "max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)", "hide_isp": "Hide instance-specific panel", "hide_shoutbox": "Hide instance shoutbox", - "right_sidebar": "Show sidebar on the right side", + "right_sidebar": "Reverse order of columns", "always_show_post_button": "Always show floating New Post button", "hide_wallpaper": "Hide instance wallpaper", "preload_images": "Preload images", @@ -481,6 +481,12 @@ "subject_line_noop": "Do not copy", "conversation_display": "Conversation display style", "conversation_display_tree": "Tree-style", + "disable_sticky_headers": "Don't stick column headers to top of the screen", + "show_scrollbars": "Show side column's scrollbars", + "third_column_mode": "When there's enough space, show third column containing", + "third_column_mode_none": "Don't show third column at all", + "third_column_mode_notifications": "Notifications column", + "third_column_mode_postform": "Main post form and navigation", "tree_advanced": "Allow more flexible navigation in tree view", "tree_fade_ancestors": "Display ancestors of the current status in faint text", "conversation_display_linear": "Linear-style", -- cgit v1.2.3-70-g09d2 From 093c85d006fac375bcdbf38964da9c011e4f00f3 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Sat, 26 Mar 2022 13:03:39 -0400 Subject: Add English translation for language options --- src/i18n/en.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index f8336e5c..76a29426 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -254,7 +254,8 @@ "password_required": "cannot be left blank", "password_confirmation_required": "cannot be left blank", "password_confirmation_match": "should be the same as password" - } + }, + "email_language": "In which language do you want to receive emails from the server?" }, "remote_user_resolver": { "remote_user_resolver": "Remote user resolver", @@ -303,6 +304,7 @@ "avatarRadius": "Avatars", "background": "Background", "bio": "Bio", + "email_language": "Language for receiving emails from the server", "block_export": "Block export", "block_export_button": "Export your blocks to a csv file", "block_import": "Block import", -- cgit v1.2.3-70-g09d2 From f661099b607220dd4d63d334eb0952e785f38183 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Sun, 12 Sep 2021 13:51:32 -0400 Subject: Add Engilsh translation for migration Ref: migrate-ui --- src/i18n/en.json | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index f8336e5c..a54fd0da 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -339,6 +339,17 @@ "delete_account_description": "Permanently delete your data and deactivate your account.", "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.", "delete_account_instructions": "Type your password in the input below to confirm account deletion.", + "account_alias": "Account aliases", + "account_alias_table_head": "Alias", + "remove_alias": "Remove this alias", + "new_alias_target": "Add a new alias (e.g. {example})", + "added_alias": "Alias is added.", + "add_alias_error": "Error adding alias: {error}", + "move_account": "Move account", + "move_account_notes": "If you want to move the account somewhere else, you must go to your target account and add an alias pointing here.", + "move_account_target": "Target account (e.g. {example})", + "moved_account": "Account is moved.", + "move_account_error": "Error moving account: {error}", "discoverable": "Allow discovery of this account in search results and other services", "domain_mutes": "Domains", "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.", -- cgit v1.2.3-70-g09d2 From 5831534800f585731264d1c4c75dd7c6faf7757d Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Thu, 24 Mar 2022 16:58:03 -0400 Subject: Add English translation for list aliases error --- src/i18n/en.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index a54fd0da..de92a14f 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -341,6 +341,8 @@ "delete_account_instructions": "Type your password in the input below to confirm account deletion.", "account_alias": "Account aliases", "account_alias_table_head": "Alias", + "list_aliases_error": "Error fetching aliases: {error}", + "hide_list_aliases_error_action": "Close", "remove_alias": "Remove this alias", "new_alias_target": "Add a new alias (e.g. {example})", "added_alias": "Alias is added.", -- cgit v1.2.3-70-g09d2 From 22af78c7f421a1b62e5149a7ea95d789493e382d Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Mon, 9 May 2022 00:38:46 -0400 Subject: Add English translations for backup UI --- src/i18n/en.json | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index f8336e5c..06c2a5e4 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -314,6 +314,16 @@ "mute_import_error": "Error importing mutes", "mutes_imported": "Mutes imported! Processing them will take a while.", "import_mutes_from_a_csv_file": "Import mutes from a csv file", + "account_backup": "Account backup", + "account_backup_description": "This allows you to download an archive of your account information and your posts, but they cannot yet be imported into a Pleroma account.", + "account_backup_table_head": "Backup", + "download_backup": "Download", + "backup_not_ready": "This backup is not ready yet.", + "remove_backup": "Remove", + "list_backups_error": "Error fetching backup list: {error}", + "add_backup": "Create a new backup", + "added_backup": "Added a new backup.", + "add_backup_error": "Error adding a new backup: {error}", "blocks_tab": "Blocks", "bot": "This is a bot account", "btnRadius": "Buttons", -- cgit v1.2.3-70-g09d2 From a4b6a97b1b96a15d5a74ae59e36eba7649ac8515 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Fri, 20 May 2022 16:35:07 -0400 Subject: Add English translations for poll-end notifications Ref: poll-notif --- src/i18n/en.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index f8336e5c..699917fe 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -160,7 +160,8 @@ "repeated_you": "repeated your status", "no_more_notifications": "No more notifications", "migrated_to": "migrated to", - "reacted_with": "reacted with {0}" + "reacted_with": "reacted with {0}", + "poll_ended": "poll has ended" }, "polls": { "add_poll": "Add poll", -- cgit v1.2.3-70-g09d2 From 6e0ceda968625259bafea72cf90446b610f0b913 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Fri, 20 May 2022 16:42:18 -0400 Subject: Add English translation for filtering end-of-poll notifications Ref: poll-notif --- src/i18n/en.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index 699917fe..733df0a0 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -428,6 +428,7 @@ "notification_visibility_repeats": "Repeats", "notification_visibility_moves": "User Migrates", "notification_visibility_emoji_reactions": "Reactions", + "notification_visibility_polls": "Ends of polls you voted in", "no_rich_text_description": "Strip rich text formatting from all posts", "no_blocks": "No blocks", "no_mutes": "No mutes", -- cgit v1.2.3-70-g09d2 From 069cf3fa87c0d29803275fe66864d5e439cad309 Mon Sep 17 00:00:00 2001 From: HJ <30-hj@users.noreply.git.pleroma.social> Date: Sun, 22 May 2022 16:38:09 +0000 Subject: Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'" This reverts merge request !1494 --- package.json | 1 - .../interface_language_switcher.vue | 38 ++++++++++------------ src/components/registration/registration.js | 14 ++------ src/components/registration/registration.vue | 12 ------- src/components/settings_modal/tabs/general_tab.js | 6 ---- src/components/settings_modal/tabs/general_tab.vue | 6 +--- src/components/settings_modal/tabs/profile_tab.js | 38 ++++++++-------------- src/components/settings_modal/tabs/profile_tab.vue | 7 ---- src/i18n/en.json | 4 +-- src/modules/config.js | 5 --- src/services/api/api.service.js | 1 - src/services/locale/locale.service.js | 27 ++------------- yarn.lock | 5 --- 13 files changed, 37 insertions(+), 127 deletions(-) (limited to 'src/i18n') diff --git a/package.json b/package.json index 58aeb363..b5ece450 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "cropperjs": "1.5.12", "diff": "3.5.0", "escape-html": "1.0.3", - "js-cookie": "^3.0.1", "localforage": "1.10.0", "parse-link-header": "1.0.1", "phoenix": "1.6.2", diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue index 7ad1fe2e..6d1f83c4 100644 --- a/src/components/interface_language_switcher/interface_language_switcher.vue +++ b/src/components/interface_language_switcher/interface_language_switcher.vue @@ -1,12 +1,12 @@