From 699ee0891ddb8d788cff77366ee8ac73eb4b02f9 Mon Sep 17 00:00:00 2001 From: scarlett Date: Tue, 4 Sep 2018 00:48:14 +0100 Subject: Changeable defaults for hideUserStats and hidePostStats --- static/config.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'static') diff --git a/static/config.json b/static/config.json index 144fe951..a6eace0f 100644 --- a/static/config.json +++ b/static/config.json @@ -10,5 +10,7 @@ "showInstanceSpecificPanel": false, "scopeOptionsEnabled": false, "formattingOptionsEnabled": false, - "collapseMessageWithSubject": false + "collapseMessageWithSubject": false, + "hidePostStats": false, + "hideUserStats": false } -- cgit v1.2.3-70-g09d2 From 455cd0d0289c7633aca22ad6e8737d449e361fce Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 25 Sep 2018 14:47:02 +0300 Subject: settings for scope/subject --- src/components/settings/settings.js | 12 ++++++++++++ src/components/settings/settings.vue | 35 +++++++++++++++++++++++++++++++++++ src/i18n/en.json | 7 +++++++ src/i18n/fr.json | 1 + src/modules/config.js | 6 ++++-- src/modules/instance.js | 2 ++ static/config.json | 4 +++- 7 files changed, 64 insertions(+), 3 deletions(-) (limited to 'static') diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index a24bc265..a7c2c565 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -26,6 +26,12 @@ const settings = { ? instance.collapseMessageWithSubject : user.collapseMessageWithSubject, collapseMessageWithSubjectDefault: this.$t('settings.values.' + instance.collapseMessageWithSubject), + subjectLineBehaviorLocal: typeof user.subjectLineBehavior === 'undefined' + ? instance.subjectLineBehavior + : user.subjectLineBehavior, + subjectLineBehaviorDefault: instance.subjectLineBehavior, + scopeCopyLocal: user.scopeCopy, + scopeCopyDefault: this.$t('settings.values.' + instance.scopeCopy), stopGifs: user.stopGifs, loopSilentAvailable: // Firefox @@ -99,6 +105,12 @@ const settings = { collapseMessageWithSubjectLocal (value) { this.$store.dispatch('setOption', { name: 'collapseMessageWithSubject', value }) }, + scopeCopyLocal (value) { + this.$store.dispatch('setOption', { name: 'scopeCopy', value }) + }, + subjectLineBehaviorLocal (value) { + this.$store.dispatch('setOption', { name: 'subjectLineBehavior', value }) + }, stopGifs (value) { this.$store.dispatch('setOption', { name: 'stopGifs', value }) } diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 42c660a3..f9e7d711 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -53,6 +53,41 @@ + +
+

{{$t('settings.composing')}}

+
    +
  • + + +
    • +
  • +
    + {{$t('settings.subject_line_behavior')}} + +
    +
    • +
+
+

{{$t('settings.attachments')}}

    diff --git a/src/i18n/en.json b/src/i18n/en.json index 2dc6493e..cd87240b 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -88,6 +88,7 @@ "change_password_error": "There was an issue changing your password.", "changed_password": "Password changed successfully!", "collapse_subject": "Collapse posts with subjects", + "composing": "Composing", "confirm_new_password": "Confirm new password", "current_avatar": "Your current avatar", "current_password": "Current password", @@ -115,6 +116,7 @@ "import_theme": "Load preset", "inputRadius": "Input fields", "instance_default: (default": "{value})", + "instance_default_simple" : "(default)", "interfaceLanguage": "Interface language", "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.", "limited_availability": "Unavailable in your browser", @@ -147,10 +149,15 @@ "saving_err": "Error saving settings", "saving_ok": "Settings saved", "security_tab": "Security", + "scope_copy": "Copy scope when replying (DMs are always copied)", "set_new_avatar": "Set new avatar", "set_new_profile_background": "Set new profile background", "set_new_profile_banner": "Set new profile banner", "settings": "Settings", + "subject_line_behavior": "Copy subject when replying", + "subject_line_email": "Like email: \"re: subject\"", + "subject_line_mastodon": "Like mastodon: copy as is", + "subject_line_noop": "Do not copy", "stop_gifs": "Play-on-hover GIFs", "streaming": "Enable automatic streaming of new posts when scrolled to the top", "text": "Text", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index cf45d9af..b76db32a 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -115,6 +115,7 @@ "import_theme": "Charger le thème", "inputRadius": "Champs de texte", "instance_default: (default": "{value})", + "instance_default_simple" : "(default)", "interfaceLanguage": "Langue de l'interface", "invalid_theme_imported": "Le fichier sélectionné n'est pas un thème Pleroma pris en charge. Aucun changement n'a été apporté à votre thème.", "limited_availability": "Non disponible dans votre navigateur", diff --git a/src/modules/config.js b/src/modules/config.js index 375d0167..0d36e9bf 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -5,7 +5,7 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0] const defaultState = { colors: {}, - collapseMessageWithSubject: false, + collapseMessageWithSubject: undefined, // instance default hideAttachments: false, hideAttachmentsInConv: false, hideNsfw: true, @@ -25,7 +25,9 @@ const defaultState = { }, muteWords: [], highlight: {}, - interfaceLanguage: browserLocale + interfaceLanguage: browserLocale, + scopeCopy: undefined, // instance default + subjectLineBehavior: undefined // instance default } const config = { diff --git a/src/modules/instance.js b/src/modules/instance.js index cb724821..0e67e4d1 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -19,6 +19,8 @@ const defaultState = { formattingOptionsEnabled: false, collapseMessageWithSubject: false, disableChat: false, + scopeCopy: false, + subjectLineBehavior: 'email', // Nasty stuff pleromaBackend: true, diff --git a/static/config.json b/static/config.json index 144fe951..988d1cf4 100644 --- a/static/config.json +++ b/static/config.json @@ -10,5 +10,7 @@ "showInstanceSpecificPanel": false, "scopeOptionsEnabled": false, "formattingOptionsEnabled": false, - "collapseMessageWithSubject": false + "collapseMessageWithSubject": false, + "scopeCopy": false, + "subjectLineBehavior": "email" } -- cgit v1.2.3-70-g09d2 From 59dec1b43f5465f484a0afea95a411a705dcb29e Mon Sep 17 00:00:00 2001 From: fadelkon Date: Sat, 13 Oct 2018 18:17:00 +0200 Subject: Finish general and timeago catalan strings. Glossary: * bio: presentació * timeline: flux [d'entrades] * post/status: entrada * settings: configuració * user: usuari/a * users: usuàries * background: fons de pantalla * banner: fons de perfil * follower: seguidor/a * follow: contacte/a qui segueixo * avatar: avatar * [visibility] scope: abast de la publicació MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Translation based on https://www.softcatala.org/guia-estil-de-softcatala/convencions-de-format/ and http://www.termcat.cat/ca/Cercaterm/ . --- src/i18n/ca.json | 170 ++++++++++++++++++++++++------------------------- static/timeago-ca.json | 10 +++ 2 files changed, 95 insertions(+), 85 deletions(-) create mode 100644 static/timeago-ca.json (limited to 'static') diff --git a/src/i18n/ca.json b/src/i18n/ca.json index 98e8fe41..d4224691 100644 --- a/src/i18n/ca.json +++ b/src/i18n/ca.json @@ -6,13 +6,13 @@ "chat": "Xat", "gopher": "Gopher", "media_proxy": "Proxy per multimèdia", - "scope_options": "Opcions d'àbast", + "scope_options": "Opcions d'abast i visibilitat", "text_limit": "Límit de text", "title": "Funcionalitats", "who_to_follow": "A qui seguir" }, "finder": { - "error_fetching_user": "Hi ha hagut un error en carregar l'usuari/a", + "error_fetching_user": "No s'ha pogut carregar l'usuari/a", "find_user": "Find user" }, "general": { @@ -29,11 +29,11 @@ }, "nav": { "chat": "Xat local públic", - "friend_requests": "Follow Requests", + "friend_requests": "Soŀlicituds de connexió", "mentions": "Mencions", "public_tl": "Flux públic del node", "timeline": "Flux personal", - "twkn": "Tota la xarxa coneguda" + "twkn": "Flux de la xarxa coneguda" }, "notifications": { "broken_favorite": "No es coneix aquest estat. S'està cercant.", @@ -75,88 +75,88 @@ "attachments": "Adjunts", "autoload": "Recarrega automàticament en arribar a sota de tot.", "avatar": "Avatar", - "avatarAltRadius": "Avatars (notificacions)", + "avatarAltRadius": "Avatars en les notificacions", "avatarRadius": "Avatars", - "background": "Imatge de fons", - "bio": "Sobre l'usuària", + "background": "Fons de pantalla", + "bio": "Sobre l'usuari/a", "btnRadius": "Botons", - "cBlue": "Blau (Respon, segueix)", - "cGreen": "Verd (Republica)", - "cOrange": "Taronja (Marca com a preferit)", - "cRed": "Red (Canceŀla", - "change_password": "Chanvia la contrasenya", - "change_password_error": "There was an issue changing your password.", - "changed_password": "Password changed successfully!", - "collapse_subject": "Collapse posts with subjects", - "confirm_new_password": "Confirm new password", - "current_avatar": "Your current avatar", - "current_password": "Current password", - "current_profile_banner": "Your current profile banner", - "data_import_export_tab": "Data Import / Export", - "default_vis": "Default visibility scope", - "delete_account": "Delete Account", - "delete_account_description": "Permanently delete your account and all your messages.", - "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.", - "export_theme": "Save preset", - "filtering": "Filtering", - "filtering_explanation": "All statuses containing these words will be muted, one per line", - "follow_export": "Follow export", - "follow_export_button": "Export your follows to a csv file", - "follow_export_processing": "Processing, you'll soon be asked to download your file", - "follow_import": "Follow import", - "follow_import_error": "Error importing followers", - "follows_imported": "Follows imported! Processing them will take a while.", - "foreground": "Foreground", + "cBlue": "Blau (respon, segueix)", + "cGreen": "Verd (republica)", + "cOrange": "Taronja (marca com a preferit)", + "cRed": "Vermell (canceŀla)", + "change_password": "Canvia la contrasenya", + "change_password_error": "No s'ha pogut canviar la contrasenya", + "changed_password": "S'ha canviat la contrasenya", + "collapse_subject": "Replega les entrades amb títol", + "confirm_new_password": "Confirma la nova contrasenya", + "current_avatar": "L'avatar actual", + "current_password": "La contrasenya actual", + "current_profile_banner": "El fons de perfil actual", + "data_import_export_tab": "Importa o exporta dades", + "default_vis": "Abast per defecte de les entrades", + "delete_account": "Esborra el compte", + "delete_account_description": "Esborra permanentment el teu compte i tots els missatges", + "delete_account_error": "No s'ha pogut esborrar el compte. Si continua el problema, contacta amb l'administració del node", + "delete_account_instructions": "Confirma que vols esborrar el compte escrivint la teva contrasenya aquí sota", + "export_theme": "Desa el tema", + "filtering": "Filtres", + "filtering_explanation": "Es silenciaran totes les entrades que continguin aquestes paraules. Separa-les per línies", + "follow_export": "Exporta la llista de contactes", + "follow_export_button": "Exporta tots els comptes que segueixes a un fitxer CSV", + "follow_export_processing": "S'està processant la petició. Aviat podràs descarregar el fitxer", + "follow_import": "Importa els contactes", + "follow_import_error": "No s'ha pogut importar els contactes", + "follows_imported": "S'han importat els contactes. Trigaran una estoneta en ser processats.", + "foreground": "Primer pla", "general": "General", - "hide_attachments_in_convo": "Hide attachments in conversations", - "hide_attachments_in_tl": "Hide attachments in timeline", - "import_followers_from_a_csv_file": "Import follows from a csv file", - "import_theme": "Load preset", - "inputRadius": "Input fields", + "hide_attachments_in_convo": "Amaga els adjunts en les converses", + "hide_attachments_in_tl": "Amaga els adjunts en el flux d'entrades", + "import_followers_from_a_csv_file": "Importa els contactes des d'un fitxer CSV", + "import_theme": "Carrega un tema", + "inputRadius": "Caixes d'entrada de text", "instance_default": "(default: {value})", - "interfaceLanguage": "Interface language", - "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.", - "limited_availability": "Unavailable in your browser", - "links": "Links", - "lock_account_description": "Restrict your account to approved followers only", - "loop_video": "Loop videos", - "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")", - "name": "Name", - "name_bio": "Name & Bio", - "new_password": "New password", - "notification_visibility": "Types of notifications to show", - "notification_visibility_follows": "Follows", - "notification_visibility_likes": "Likes", - "notification_visibility_mentions": "Mentions", - "notification_visibility_repeats": "Repeats", - "no_rich_text_description": "Strip rich text formatting from all posts", - "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding", - "panelRadius": "Panels", - "pause_on_unfocused": "Pause streaming when tab is not focused", - "presets": "Presets", - "profile_background": "Profile Background", - "profile_banner": "Profile Banner", - "profile_tab": "Profile", - "radii_help": "Set up interface edge rounding (in pixels)", + "interfaceLanguage": "Llengua de la interfície", + "invalid_theme_imported": "No s'ha entès l'arxiu carregat perquè no és un tema vàlid de Pleroma. No s'ha fet cap canvi als temes actuals.", + "limited_availability": "No està disponible en aquest navegador", + "links": "Enllaços", + "lock_account_description": "Restringeix el teu compte només a seguidores aprovades.", + "loop_video": "Reprodueix els vídeos en bucle", + "loop_video_silent_only": "Reprodueix en bucles només els vídeos sense so (com els \"GIF\" de Mastodon)", + "name": "Nom", + "name_bio": "Nom i presentació", + "new_password": "Contrasenya nova", + "notification_visibility": "Notifica'm quan algú", + "notification_visibility_follows": "Comença a seguir-me", + "notification_visibility_likes": "Marca com a preferida una entrada meva", + "notification_visibility_mentions": "Em menciona", + "notification_visibility_repeats": "Republica una entrada meva", + "no_rich_text_description": "Neteja el formatat de text de totes les entrades", + "nsfw_clickthrough": "Amaga el contingut NSFW darrer d'una imatge clicable", + "panelRadius": "Panells", + "pause_on_unfocused": "Pausa la reproducció en continu quan la pestanya perdi el focus", + "presets": "Temes", + "profile_background": "Fons de pantalla", + "profile_banner": "Fons de perfil", + "profile_tab": "Perfil", + "radii_help": "Configura l'arrodoniment de les vores (en píxels)", "replies_in_timeline": "Replies in timeline", - "reply_link_preview": "Enable reply-link preview on mouse hover", - "reply_visibility_all": "Show all replies", - "reply_visibility_following": "Only show replies directed at me or users I'm following", - "reply_visibility_self": "Only show replies directed at me", - "saving_err": "Error saving settings", - "saving_ok": "Settings saved", - "security_tab": "Security", - "set_new_avatar": "Set new avatar", - "set_new_profile_background": "Set new profile background", - "set_new_profile_banner": "Set new profile banner", - "settings": "Settings", - "stop_gifs": "Play-on-hover GIFs", - "streaming": "Enable automatic streaming of new posts when scrolled to the top", + "reply_link_preview": "Mostra el missatge citat en passar el ratolí per sobre de l'enllaç de resposta", + "reply_visibility_all": "Mostra totes les respostes", + "reply_visibility_following": "Mostra només les respostes a entrades meves o d'usuàries que jo segueixo", + "reply_visibility_self": "Mostra només les respostes a entrades meves", + "saving_err": "No s'ha pogut desar la configuració", + "saving_ok": "S'ha desat la configuració", + "security_tab": "Seguretat", + "set_new_avatar": "Canvia l'avatar", + "set_new_profile_background": "Canvia el fons de pantalla", + "set_new_profile_banner": "Canvia el fons del perfil", + "settings": "Configuració", + "stop_gifs": "Anima els GIF només en passar-hi el ratolí per sobre", + "streaming": "Carrega automàticament entrades noves quan estigui a dalt de tot", "text": "Text", - "theme": "Theme", - "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.", - "tooltipRadius": "Tooltips/alerts", + "theme": "Tema", + "theme_help": "Personalitza els colors del tema. Escriu-los en format RGB hexadecimal (#rrggbb)", + "tooltipRadius": "Missatges sobreposats", "user_settings": "Configuració personal", "values": { "false": "no", @@ -164,12 +164,12 @@ } }, "timeline": { - "collapse": "Amaga", + "collapse": "Replega", "conversation": "Conversa", - "error_fetching": "S'ha produït un error en carregar els estats", - "load_older": "Carrera estats anteriors", - "no_retweet_hint": "L'entrada és només per a seguidores o \"directa\" i no es pot republicar", - "repeated": "repetit", + "error_fetching": "S'ha produït un error en carregar les entrades", + "load_older": "Carrega entrades anteriors", + "no_retweet_hint": "L'entrada és només per a seguidores o és \"directa\", i per tant no es pot republicar", + "repeated": "republicat", "show_new": "Mostra els nous", "up_to_date": "Actualitzat" }, diff --git a/static/timeago-ca.json b/static/timeago-ca.json new file mode 100644 index 00000000..d6fca3be --- /dev/null +++ b/static/timeago-ca.json @@ -0,0 +1,10 @@ +[ + "ara mateix", + ["fa %ss", "fa %ss"], + ["fa %smin","fa %smin"], + ["fa %sh", "fa %sh"], + ["fa %sd", "fa %sd"], + ["fa %sw", "fa %sw"], + ["fa %smo", "fa %smo"], + ["fa %sy", "fa %sy"] +] -- cgit v1.2.3-70-g09d2 From bf3e3f8b9acf2d2bd3452894dac4df7ca6ce3605 Mon Sep 17 00:00:00 2001 From: fadelkon Date: Tue, 16 Oct 2018 18:11:49 +0200 Subject: Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text. --- src/i18n/ca.json | 6 +++--- static/timeago-ca.json | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'static') diff --git a/src/i18n/ca.json b/src/i18n/ca.json index d4224691..fa517e22 100644 --- a/src/i18n/ca.json +++ b/src/i18n/ca.json @@ -52,7 +52,7 @@ "plain_text": "Text pla" }, "content_warning": "Assumpte (opcional)", - "default": "Em sento", + "default": "Em sento…", "direct_warning": "Aquesta entrada només serà visible per les usuràries que etiquetis", "posting": "Publicació", "scope": { @@ -63,7 +63,7 @@ } }, "registration": { - "bio": "Sobre mi", + "bio": "Presentació", "email": "Correu", "fullname": "Nom per mostrar", "password_confirm": "Confirma la contrasenya", @@ -78,7 +78,7 @@ "avatarAltRadius": "Avatars en les notificacions", "avatarRadius": "Avatars", "background": "Fons de pantalla", - "bio": "Sobre l'usuari/a", + "bio": "Presentació", "btnRadius": "Botons", "cBlue": "Blau (respon, segueix)", "cGreen": "Verd (republica)", diff --git a/static/timeago-ca.json b/static/timeago-ca.json index d6fca3be..ef782caf 100644 --- a/static/timeago-ca.json +++ b/static/timeago-ca.json @@ -1,10 +1,10 @@ [ "ara mateix", - ["fa %ss", "fa %ss"], - ["fa %smin","fa %smin"], - ["fa %sh", "fa %sh"], - ["fa %sd", "fa %sd"], - ["fa %sw", "fa %sw"], - ["fa %smo", "fa %smo"], - ["fa %sy", "fa %sy"] + ["fa %s s", "fa %s s"], + ["fa %s min", "fa %s min"], + ["fa %s h", "fa %s h"], + ["fa %s dia", "fa %s dies"], + ["fa %s setm.", "fa %s setm."], + ["fa %s mes", "fa %s mesos"], + ["fa %s any", "fa %s anys"] ] -- cgit v1.2.3-70-g09d2 From 0a261d2a7d04e457b53885bca1c6c87fe953db9b Mon Sep 17 00:00:00 2001 From: Exilat Date: Thu, 25 Oct 2018 17:19:31 +0000 Subject: Adds Occitan locale --- static/timeago-oc.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 static/timeago-oc.json (limited to 'static') diff --git a/static/timeago-oc.json b/static/timeago-oc.json new file mode 100644 index 00000000..7e439871 --- /dev/null +++ b/static/timeago-oc.json @@ -0,0 +1,10 @@ +[ + "ara meteis", + ["fa %s s", "fa %s s"], + ["fa %s min", "fa %s min"], + ["fa %s h", "fa %s h"], + ["fa %s dia", "fa %s jorns"], + ["fa %s setm.", "fa %s setm."], + ["fa %s mes", "fa %s meses"], + ["fa %s any", "fa %s ans"] +] -- cgit v1.2.3-70-g09d2 From 6dd675566ed2af047e12ee6d6b4308860e708809 Mon Sep 17 00:00:00 2001 From: Exilat Date: Sun, 28 Oct 2018 12:38:40 +0000 Subject: Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan. --- static/timeago-oc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'static') diff --git a/static/timeago-oc.json b/static/timeago-oc.json index 7e439871..a6b3932f 100644 --- a/static/timeago-oc.json +++ b/static/timeago-oc.json @@ -3,8 +3,8 @@ ["fa %s s", "fa %s s"], ["fa %s min", "fa %s min"], ["fa %s h", "fa %s h"], - ["fa %s dia", "fa %s jorns"], + ["fa %s jorn", "fa %s jorns"], ["fa %s setm.", "fa %s setm."], ["fa %s mes", "fa %s meses"], - ["fa %s any", "fa %s ans"] + ["fa %s an", "fa %s ans"] ] -- cgit v1.2.3-70-g09d2 From 4f258b4940c68722c3c7f5127c4abc083ffd936d Mon Sep 17 00:00:00 2001 From: dgold Date: Fri, 2 Nov 2018 20:08:11 +0000 Subject: Added Irish (Gaeilge) Language All translations checked with tearma.ie & acmhainn.ie for language use and technical accuracy. --- src/i18n/ga.json | 201 +++++++++++++++++++++++++++++++++++++++++++++++++ src/i18n/messages.js | 1 + static/timeago-ga.json | 10 +++ 3 files changed, 212 insertions(+) create mode 100644 src/i18n/ga.json create mode 100644 static/timeago-ga.json (limited to 'static') diff --git a/src/i18n/ga.json b/src/i18n/ga.json new file mode 100644 index 00000000..64461202 --- /dev/null +++ b/src/i18n/ga.json @@ -0,0 +1,201 @@ +{ + "chat": { + "title": "Comhrá" + }, + "features_panel": { + "chat": "Comhrá", + "gopher": "Gófar", + "media_proxy": "Seachfhreastalaí meáin", + "scope_options": "Rogha scóip", + "text_limit": "Teorainn Téacs", + "title": "Gnéithe", + "who_to_follow": "Daoine le leanúint" + }, + "finder": { + "error_fetching_user": "Earráid a aimsiú d'úsáideoir", + "find_user": "Aimsigh úsáideoir" + }, + "general": { + "apply": "Feidhmigh", + "submit": "Deimhnigh" + }, + "login": { + "login": "Logáil isteach", + "logout": "Logáil amach", + "password": "Pasfhocal", + "placeholder": "m.sh. Daire", + "register": "Clárú", + "username": "Ainm Úsáideora" + }, + "nav": { + "chat": "Comhrá Áitiúil", + "friend_requests": "Iarratas ar Cairdeas", + "mentions": "Tagairt", + "public_tl": "Amlíne Poiblí", + "timeline": "Amlíne", + "twkn": "An Líonra Iomlán" + }, + "notifications": { + "broken_favorite": "Post anaithnid. Cuardach dó...", + "favorited_you": "toghadh le do phost", + "followed_you": "lean tú", + "load_older": "Luchtaigh fógraí aosta", + "notifications": "Fógraí", + "read": "Léigh!", + "repeated_you": "athphostáil tú" + }, + "post_status": { + "account_not_locked_warning": "Níl do chuntas {0}. Is féidir le duine ar bith a leanúint leat chun do phoist leantacha amháin a fheiceáil.", + "account_not_locked_warning_link": "faoi glas", + "attachments_sensitive": "Marcáil ceangaltán mar íogair", + "content_type": { + "plain_text": "Gnáth-théacs" + }, + "content_warning": "Teideal (roghnach)", + "default": "Lá iontach anseo i nGaillimh", + "direct_warning": "Ní bheidh an post seo le feiceáil ach amháin do na húsáideoirí atá luaite.", + "posting": "Post nua", + "scope": { + "direct": "Díreach - Post chuig úsáideoirí luaite amháin", + "private": "Leanúna amháin - Post chuig lucht leanúna amháin", + "public": "Poiblí - Post chuig amlínte poiblí", + "unlisted": "Neamhliostaithe - Ná cuir post chuig amlínte poiblí" + } + }, + "registration": { + "bio": "Scéal saoil", + "email": "Ríomhphost", + "fullname": "Ainm taispeána'", + "password_confirm": "Deimhnigh do pasfhocal", + "registration": "Clárú", + "token": "Cód cuireadh" + }, + "settings": { + "attachmentRadius": "Ceangaltáin", + "attachments": "Ceangaltáin", + "autoload": "Cumasaigh luchtú uathoibríoch nuair a scrollaítear go bun", + "avatar": "Phictúir phrófíle", + "avatarAltRadius": "Phictúirí phrófíle (Fograí)", + "avatarRadius": "Phictúirí phrófíle", + "background": "Cúlra", + "bio": "Scéal saoil", + "btnRadius": "Cnaipí", + "cBlue": "Gorm (Freagra, lean)", + "cGreen": "Glas (Athphóstail)", + "cOrange": "Oráiste (Cosúil)", + "cRed": "Dearg (Cealaigh)", + "change_password": "Athraigh do pasfhocal", + "change_password_error": "Bhí fadhb ann ag athrú do pasfhocail", + "changed_password": "Athraigh an pasfhocal go rathúil!", + "collapse_subject": "Poist a chosc le teidil", + "confirm_new_password": "Deimhnigh do pasfhocal nua", + "current_avatar": "Phictúir phrófíle", + "current_password": "Pasfhocal reatha", + "current_profile_banner": "Phictúir ceanntáisc", + "data_import_export_tab": "Iompórtáil / Easpórtáil Sonraí", + "default_vis": "Scóip infheicthe réamhshocraithe", + "delete_account": "Scrios cuntas", + "delete_account_description": "Do chuntas agus do chuid teachtaireachtaí go léir a scriosadh go buan.", + "delete_account_error": "Bhí fadhb ann a scriosadh do chuntas. Má leanann sé seo, téigh i dteagmháil le do riarthóir.", + "delete_account_instructions": "Scríobh do phasfhocal san ionchur thíos chun deimhniú a scriosadh.", + "export_theme": "Sábháil Téama", + "filtering": "Scagadh", + "filtering_explanation": "Beidh gach post ina bhfuil na focail seo i bhfolach, ceann in aghaidh an líne", + "follow_export": "Easpórtáil do leanann", + "follow_export_button": "Easpórtáil do leanann chuig comhad csv", + "follow_export_processing": "Próiseáil. Iarrtar ort go luath an comhad a íoslódáil.", + "follow_import": "Iompórtáil do leanann", + "follow_import_error": "Earráid agus do leanann a iompórtáil", + "follows_imported": "Do leanann iompórtáil! Tógfaidh an próiseas iad le tamall.", + "foreground": "Tulra", + "general": "Ginearálta", + "hide_attachments_in_convo": "Folaigh ceangaltáin i comhráite", + "hide_attachments_in_tl": "Folaigh ceangaltáin sa amlíne", + "hide_post_stats": "Folaigh staitisticí na bpost (m.sh. líon na n-athrá)", + "hide_user_stats": "Folaigh na staitisticí úsáideora (m.sh. líon na leantóiri)", + "import_followers_from_a_csv_file": "Iompórtáil leanann ó chomhad csv", + "import_theme": "Luchtaigh Téama", + "inputRadius": "Limistéar iontrála", + "instance_default": "(Réamhshocrú: {value})", + "interfaceLanguage": "Teanga comhéadain", + "invalid_theme_imported": "Ní téama bailí é an comhad dícheangailte. Níor rinneadh aon athruithe.", + "limited_availability": "Níl sé ar fáil i do bhrabhsálaí", + "links": "Naisc", + "lock_account_description": "Srian a chur ar do chuntas le lucht leanúna ceadaithe amháin", + "loop_video": "Lúb físeáin", + "loop_video_silent_only": "Lúb físeáin amháin gan fuaim (i.e. Mastodon's \"gifs\")", + "name": "Ainm", + "name_bio": "Ainm ⁊ Scéal", + "new_password": "Pasfhocal nua'", + "notification_visibility": "Cineálacha fógraí a thaispeáint", + "notification_visibility_follows": "Leana", + "notification_visibility_likes": "Thaithin", + "notification_visibility_mentions": "Tagairt", + "notification_visibility_repeats": "Atphostáil", + "no_rich_text_description": "Bain formáidiú téacs saibhir ó gach post", + "nsfw_clickthrough": "Cumasaigh an ceangaltán NSFW cliceáil ar an gcnaipe", + "panelRadius": "Painéil", + "pause_on_unfocused": "Sruthú ar sos nuair a bhíonn an fócas caillte", + "presets": "Réamhshocruithe", + "profile_background": "Cúlra Próifíl", + "profile_banner": "Phictúir Ceanntáisc", + "profile_tab": "Próifíl", + "radii_help": "Cruinniú imeall comhéadan a chumrú (i bpicteilíní)", + "replies_in_timeline": "Freagraí sa amlíne", + "reply_link_preview": "Cumasaigh réamhamharc nasc freagartha ar chlár na luiche", + "reply_visibility_all": "Taispeáin gach freagra", + "reply_visibility_following": "Taispeáin freagraí amháin atá dírithe ar mise nó ar úsáideoirí atá mé ag leanúint", + "reply_visibility_self": "Taispeáin freagraí amháin atá dírithe ar mise", + "saving_err": "Earráid socruithe a shábháil", + "saving_ok": "Socruithe sábháilte", + "security_tab": "Slándáil", + "set_new_avatar": "Athraigh do phictúir phrófíle", + "set_new_profile_background": "Athraigh do cúlra próifíl", + "set_new_profile_banner": "Athraigh do phictúir ceanntáisc", + "settings": "Socruithe", + "stop_gifs": "Seinn GIFs ar an scáileán", + "streaming": "Cumasaigh post nua a shruthú uathoibríoch nuair a scrollaítear go barr an leathanaigh", + "text": "Téacs", + "theme": "Téama", + "theme_help": "Úsáid cód daith hex (#rrggbb) chun do schéim a saincheapadh", + "tooltipRadius": "Bileoga eolais", + "user_settings": "Socruithe úsáideora", + "values": { + "false": "níl", + "true": "tá" + } + }, + "timeline": { + "collapse": "Folaigh", + "conversation": "Cómhra", + "error_fetching": "Earráid a thabhairt cothrom le dáta", + "load_older": "Luchtaigh níos mó", + "no_retweet_hint": "Tá an post seo marcáilte mar lucht leanúna amháin nó díreach agus ní féidir é a athphostáil", + "repeated": "athphostáil", + "show_new": "Taispeáin nua", + "up_to_date": "Nuashonraithe" + }, + "user_card": { + "approve": "Údaraigh", + "block": "Cosc", + "blocked": "Cuireadh coisc!", + "deny": "Diúltaigh", + "follow": "Lean", + "followees": "Leantóirí", + "followers": "Á Leanúint", + "following": "Á Leanúint", + "follows_you": "Leanann tú", + "mute": "Cuir i mód ciúin", + "muted": "Mód ciúin", + "per_day": "laethúil", + "remote_follow": "Leaníunt iargúlta", + "statuses": "Poist" + }, + "user_profile": { + "timeline_title": "Amlíne úsáideora" + }, + "who_to_follow": { + "more": "Feach uile", + "who_to_follow": "Daoine le leanúint" + } +} diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 4cd3c4e2..18308a72 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -17,6 +17,7 @@ const messages = { et: require('./et.json'), fi: require('./fi.json'), fr: require('./fr.json'), + ga: require('./ga.json'), he: require('./he.json'), hu: require('./hu.json'), it: require('./it.json'), diff --git a/static/timeago-ga.json b/static/timeago-ga.json new file mode 100644 index 00000000..bdb7b6c4 --- /dev/null +++ b/static/timeago-ga.json @@ -0,0 +1,10 @@ +[ + "Anois", + ["%s s", "%s s"], + ["%s n", "%s nóimeád"], + ["%s u", "%s uair"], + ["%s l", "%s lá"], + ["%s se", "%s seachtaine"], + ["%s m", "%s mí"], + ["%s b", "%s bliainta"] +] \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 50264410f541c8f9f3416bd0027fc199cb96e424 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Wed, 7 Nov 2018 16:56:12 +0100 Subject: Add login form back in. --- README.md | 6 ++++++ src/boot/after_store.js | 2 ++ src/components/login_form/login_form.js | 26 ++++++++++++++++++-------- src/components/login_form/login_form.vue | 19 ++++++++++++++++++- src/modules/instance.js | 1 + static/config.json | 3 ++- 6 files changed, 47 insertions(+), 10 deletions(-) (limited to 'static') diff --git a/README.md b/README.md index 5a3e2a4b..b6e5a586 100644 --- a/README.md +++ b/README.md @@ -32,3 +32,9 @@ npm run unit # Configuration Edit config.json for configuration. scopeOptionsEnabled gives you input fields for CWs and the scope settings. + +## Options + +### Login methods + +```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 65d1ea02..6b8aef7f 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -53,6 +53,7 @@ const afterStoreSetup = ({store, i18n}) => { var scopeOptionsEnabled = (config.scopeOptionsEnabled) var formattingOptionsEnabled = (config.formattingOptionsEnabled) var collapseMessageWithSubject = (config.collapseMessageWithSubject) + var loginMethod = (config.loginMethod) store.dispatch('setInstanceOption', { name: 'theme', value: theme }) store.dispatch('setInstanceOption', { name: 'background', value: background }) @@ -67,6 +68,7 @@ const afterStoreSetup = ({store, i18n}) => { store.dispatch('setInstanceOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled }) store.dispatch('setInstanceOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled }) store.dispatch('setInstanceOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject }) + store.dispatch('setInstanceOption', { name: 'loginMethod', value: loginMethod }) if (chatDisabled) { store.dispatch('disableChat') } diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js index ffdd5504..49868aed 100644 --- a/src/components/login_form/login_form.js +++ b/src/components/login_form/login_form.js @@ -5,6 +5,7 @@ const LoginForm = { authError: false }), computed: { + loginMethod () { return this.$store.state.instance.loginMethod }, loggingIn () { return this.$store.state.users.loggingIn }, registrationOpen () { return this.$store.state.instance.registrationOpen } }, @@ -17,14 +18,23 @@ const LoginForm = { }) }, submit () { - this.$store.dispatch('loginUser', this.user).then( - () => {}, - (error) => { - this.authError = error - this.user.username = '' - this.user.password = '' - } - ) + const data = { + oauth: this.$store.state.oauth, + instance: this.$store.state.instance.server + } + oauthApi.getOrCreateApp(data).then((app) => { + oauthApi.getTokenWithCredentials( + { + app, + instance: data.instance, + username: this.user.username, + password: this.user.password}) + .then((result) => { + this.$store.commit('setToken', result.access_token) + this.$store.dispatch('loginUser', result.access_token) + this.$router.push('/main/friends') + }) + }) } } } diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue index db389716..8a5174d7 100644 --- a/src/components/login_form/login_form.vue +++ b/src/components/login_form/login_form.vue @@ -5,7 +5,24 @@ {{$t('login.login')}}
- + +