From a6fa913f45e79734ff13fe85c7ed71cb7b2e5477 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 15 Apr 2018 07:25:59 +0300 Subject: Input fields separate radii --- src/i18n/messages.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 168548cf..b1c6ddab 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -58,6 +58,7 @@ const de = { cOrange: 'Orange (Favorisieren)', cGreen: 'Grün (Retweet)', btnRadius: 'Buttons', + inputRadius: 'Input fields', panelRadius: 'Panel', avatarRadius: 'Avatare', avatarAltRadius: 'Avatare (Benachrichtigungen)', @@ -1488,6 +1489,7 @@ const ru = { cOrange: 'Нравится', cGreen: 'Повторить', btnRadius: 'Кнопки', + inputRadius: 'Поля ввода', panelRadius: 'Панели', avatarRadius: 'Аватары', avatarAltRadius: 'Аватары в уведомлениях', -- cgit v1.2.3-70-g09d2 From 61fd0b65d99c0fe828bfc029d9d016934f7f1059 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 15 Apr 2018 07:52:14 +0300 Subject: i18n --- src/i18n/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index b1c6ddab..a13d7f58 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -58,7 +58,6 @@ const de = { cOrange: 'Orange (Favorisieren)', cGreen: 'Grün (Retweet)', btnRadius: 'Buttons', - inputRadius: 'Input fields', panelRadius: 'Panel', avatarRadius: 'Avatare', avatarAltRadius: 'Avatare (Benachrichtigungen)', @@ -271,6 +270,7 @@ const en = { cOrange: 'Orange (Favorite)', cGreen: 'Green (Retweet)', btnRadius: 'Buttons', + inputRadius: 'Input fields', panelRadius: 'Panels', avatarRadius: 'Avatars', avatarAltRadius: 'Avatars (Notifications)', -- cgit v1.2.3-70-g09d2 From 327b6fb5dcbabf5de61e1ce0fa6c65329a8ec45b Mon Sep 17 00:00:00 2001 From: Syldexia Date: Sun, 13 May 2018 15:09:07 +0100 Subject: Added delete account section to user settings --- src/components/user_settings/user_settings.js | 20 +++++++++++++++++++- src/components/user_settings/user_settings.vue | 14 ++++++++++++++ src/i18n/messages.js | 6 +++++- src/services/api/api.service.js | 17 ++++++++++++++++- .../backend_interactor_service.js | 5 ++++- 5 files changed, 58 insertions(+), 4 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 25ee1f35..5ef38848 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -9,7 +9,10 @@ const UserSettings = { followImportError: false, followsImported: false, uploading: [ false, false, false, false ], - previews: [ null, null, null ] + previews: [ null, null, null ], + deletingAccount: false, + deleteAccountConfirmPasswordInput: '', + deleteAccountError: false } }, components: { @@ -146,6 +149,21 @@ const UserSettings = { dismissImported () { this.followsImported = false this.followImportError = false + }, + confirmDelete () { + this.deletingAccount = true + }, + deleteAccount () { + this.$store.state.api.backendInteractor.deleteAccount({password: this.deleteAccountConfirmPasswordInput}) + .then((res) => { + console.log(res) + if (res.status === 'success') { + this.$store.dispatch('logout') + window.location.href = '/main/all' + } else { + this.deleteAccountError = res.error + } + }) } } } diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index ed1864cc..fbfbef8a 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -66,6 +66,20 @@

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

+
+
+

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

+

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

+
+

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

+

{{$t('login.password')}}

+ + +
+

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

+

{{deleteAccountError}}

+ +
diff --git a/src/i18n/messages.js b/src/i18n/messages.js index a13d7f58..897f95d2 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -289,7 +289,11 @@ const en = { follow_import: 'Follow import', import_followers_from_a_csv_file: 'Import follows from a csv file', follows_imported: 'Follows imported! Processing them will take a while.', - follow_import_error: 'Error importing followers' + follow_import_error: 'Error importing followers', + delete_account: 'Delete Account', + delete_account_description: 'Permanantly delete your account and all your messages.', + delete_account_instructions: 'Type your password in the input below to confirm account deletion.', + delete_account_error: 'There was an issue deleting your account. If this persists please contact your instance administrator.' }, notifications: { notifications: 'Notifications', diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index f14bfd6d..fd401068 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -30,6 +30,7 @@ const BLOCKING_URL = '/api/blocks/create.json' const UNBLOCKING_URL = '/api/blocks/destroy.json' const USER_URL = '/api/users/show.json' const FOLLOW_IMPORT_URL = '/api/pleroma/follow_import' +const DELETE_ACCOUNT_URL = '/api/pleroma/delete_account' import { each, map } from 'lodash' import 'whatwg-fetch' @@ -373,6 +374,19 @@ const followImport = ({params, credentials}) => { .then((response) => response.ok) } +const deleteAccount = ({credentials, password}) => { + const form = new FormData() + + form.append('password', password) + + return fetch(DELETE_ACCOUNT_URL, { + body: form, + method: 'POST', + headers: authHeaders(credentials) + }) + .then((response) => response.json()) +} + const fetchMutes = ({credentials}) => { const url = '/api/qvitter/mutes.json' @@ -408,7 +422,8 @@ const apiService = { updateProfile, updateBanner, externalProfile, - followImport + followImport, + deleteAccount } export default apiService diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js index 52b8286b..c5807bed 100644 --- a/src/services/backend_interactor_service/backend_interactor_service.js +++ b/src/services/backend_interactor_service/backend_interactor_service.js @@ -61,6 +61,8 @@ const backendInteractorService = (credentials) => { const externalProfile = (profileUrl) => apiService.externalProfile({profileUrl, credentials}) const followImport = ({params}) => apiService.followImport({params, credentials}) + const deleteAccount = ({password}) => apiService.deleteAccount({credentials, password}) + const backendInteractorServiceInstance = { fetchStatus, fetchConversation, @@ -82,7 +84,8 @@ const backendInteractorService = (credentials) => { updateBanner, updateProfile, externalProfile, - followImport + followImport, + deleteAccount } return backendInteractorServiceInstance -- cgit v1.2.3-70-g09d2 From fae7a40aebc4266260c8cb0dcac929ac03500590 Mon Sep 17 00:00:00 2001 From: aka Date: Sun, 13 May 2018 20:47:08 -0300 Subject: Adds an option to export follows --- src/components/user_settings/user_settings.js | 29 ++++++++++++++++++++++++++ src/components/user_settings/user_settings.vue | 7 +++++++ src/i18n/messages.js | 5 ++++- 3 files changed, 40 insertions(+), 1 deletion(-) (limited to 'src/i18n/messages.js') diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 25ee1f35..602052ca 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -8,6 +8,7 @@ const UserSettings = { followList: null, followImportError: false, followsImported: false, + enableFollowsExport: true, uploading: [ false, false, false, false ], previews: [ null, null, null ] } @@ -137,6 +138,34 @@ const UserSettings = { this.uploading[3] = false }) }, + /* This function takes an Array of Users + * and outputs a file with all the addresses for the user to download + */ + exportPeople(Users) { + // Get all the friends addresses + var UserAddresses = Users.map(function(user) { + // check is it's a local user + if(user && user.is_local) { + // append the instance address + user.screen_name += '@' + location.hostname; + } + return user.screen_name; + }).join('\n'); + // Make the user download the file + var fileToDownload = document.createElement('a'); + fileToDownload.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(UserAddresses)); + fileToDownload.setAttribute('download', 'friends.csv'); + fileToDownload.style.display = 'none'; + document.body.appendChild(fileToDownload); + fileToDownload.click(); + document.body.removeChild(fileToDownload); + }, + exportFollows() { + this.enableFollowsExport = false; + this.$store.state.api.backendInteractor + .fetchFriends({id: this.$store.state.users.currentUser.id}) + .then(this.exportPeople); + }, followListChange () { // eslint-disable-next-line no-undef let formData = new FormData() diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index ed1864cc..184d158d 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -66,6 +66,13 @@

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

+
+

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

+ +
+
+

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

+
diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 168548cf..473fd9b1 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -288,7 +288,10 @@ const en = { follow_import: 'Follow import', import_followers_from_a_csv_file: 'Import follows from a csv file', follows_imported: 'Follows imported! Processing them will take a while.', - follow_import_error: 'Error importing followers' + follow_import_error: 'Error importing followers', + follow_export: 'Follow export', + follow_export_processing: 'Processing, you\'ll soon be aked to download your file', + follow_export_button: 'Export your follows to a csv file' }, notifications: { notifications: 'Notifications', -- cgit v1.2.3-70-g09d2 From 1ff089a175eb5c77f86896b89728aa9066a4699f Mon Sep 17 00:00:00 2001 From: Exilat Date: Tue, 15 May 2018 05:14:59 +0000 Subject: Update messages.js --- src/i18n/messages.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index a13d7f58..46da4404 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1018,7 +1018,7 @@ const oc = { timeline: { show_new: 'Ne veire mai', error_fetching: 'Error en cercant de mesas a jorn', - up_to_date: 'Actualizat', + up_to_date: 'A jorn', load_older: 'Ne veire mai', conversation: 'Conversacion', collapse: 'Tampar', @@ -1050,6 +1050,7 @@ const oc = { cRed: 'Roge (Anullar)', cOrange: 'Irange (Metre en favorit)', cGreen: 'Verd (Repartajar)', + inputRadius: 'Camps tèxte', btnRadius: 'Botons', panelRadius: 'Panèls', avatarRadius: 'Avatars', @@ -1074,7 +1075,7 @@ const oc = { notifications: { notifications: 'Notficacions', read: 'Legit !', - followed_you: 'vos a seguit', + followed_you: 'vos sèc', favorited_you: 'a aimat vòstre estatut', repeated_you: 'a repetit your vòstre estatut' }, @@ -1105,7 +1106,7 @@ const oc = { apply: 'Aplicar' }, user_profile: { - timeline_title: 'Flux a l’utilizaire' + timeline_title: 'Flux utilizaire' } } -- cgit v1.2.3-70-g09d2 From 1487474c187cac17233f7e7942ddec2a5b8b700a Mon Sep 17 00:00:00 2001 From: Azurolu Date: Tue, 15 May 2018 11:17:32 +0000 Subject: Added inputRadius french translation and improved french translation as discussed with Chip. --- src/i18n/messages.js | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index a13d7f58..4ddf3309 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -851,32 +851,32 @@ const fr = { user_settings: 'Paramètres utilisateur', name_bio: 'Nom & Bio', name: 'Nom', - bio: 'Bioraphie', + bio: 'Biographie', avatar: 'Avatar', - current_avatar: 'Votre avatar', + current_avatar: 'Avatar actuel', set_new_avatar: 'Changer d\'avatar', - profile_banner: 'Bannière du profil', - current_profile_banner: 'Bannière du profil', + profile_banner: 'Bannière de profil', + current_profile_banner: 'Bannière de profil actuelle', set_new_profile_banner: 'Changer de bannière', profile_background: 'Image de fond', set_new_profile_background: 'Changer d\'image de fond', settings: 'Paramètres', theme: 'Thème', filtering: 'Filtre', - filtering_explanation: 'Tout les statuts contenant ces mots vont être cachés, un mot par ligne.', + filtering_explanation: 'Tout les statuts contenant ces mots seront masqués. Un mot par ligne.', attachments: 'Pièces jointes', - hide_attachments_in_tl: 'Cacher les pièces jointes dans le journal', - hide_attachments_in_convo: 'Cacher les pièces jointes dans les conversations', - nsfw_clickthrough: 'Activer le clic pour afficher les images marquées comme contenu adulte ou sensible', - autoload: 'Activer le chargement automatique une fois le bas de la page atteint', + hide_attachments_in_tl: 'Masquer les pièces jointes dans le journal', + hide_attachments_in_convo: 'Masquer les pièces jointes dans les conversations', + nsfw_clickthrough: 'Masquer les images marquées comme contenu adulte ou sensible', + autoload: 'Charger la suite automatiquement une fois le bas de la page atteint', reply_link_preview: 'Activer un aperçu d\'une réponse sur passage de la souris', presets: 'Thèmes prédéfinis', - theme_help: 'Utilisez les codes de couleur hexadécimaux (#aabbcc) pour customiser les couleurs de votre thème.', + theme_help: 'Spécifiez des codes couleur hexadécimaux (#aabbcc) pour personnaliser les couleurs du thème', background: 'Arrière plan', foreground: 'Premier plan', text: 'Texte', links: 'Liens', - streaming: 'Active le défilement automatique de nouveaux statuts lorsqu\'on est au haut de la page', + streaming: 'Charger automatiquement les nouveaux statuts lorsque vous êtes au haut de la page', follow_import: 'Importer ses abonnements', import_followers_from_a_csv_file: 'Importer ses abonnements depuis un fichier csv', follows_imported: 'Abonnements importés ! Le traitement peut prendre un moment.', @@ -887,12 +887,13 @@ const fr = { cGreen: 'Vert (Partager)', btnRadius: 'Boutons', panelRadius: 'Fenêtres', + inputRadius: 'Champs de texte', avatarRadius: 'Avatars', avatarAltRadius: 'Avatars (Notifications)', tooltipRadius: 'Info-bulles/alertes ', attachmentRadius: 'Pièces jointes', radii_help: 'Mettre en place l\'arondissement des coins de l\'interface (en pixels)', - stop_gifs: 'Passer la souris sur un GIF pour l\'animer' + stop_gifs: 'N\'animer les GIFS que lors du survol du curseur de la souris' }, notifications: { notifications: 'Notifications', @@ -910,10 +911,10 @@ const fr = { }, registration: { registration: 'Inscription', - fullname: 'Nom affiché', + fullname: 'Pseudonyme', email: 'Adresse email', bio: 'Biographie', - password_confirm: 'Confirmez le mot de passe' + password_confirm: 'Confirmation le mot de passe' }, post_status: { posting: 'Envoi en cours', @@ -921,7 +922,7 @@ const fr = { }, finder: { find_user: 'Chercher un utilisateur', - error_fetching_user: 'Une erreur est survenue lors de la recherche de l\'utilisateur' + error_fetching_user: 'Erreur lors de la recherche de l\'utilisateur' }, general: { submit: 'Envoyer', -- cgit v1.2.3-70-g09d2 From fc2bb104442f8e3bbbe661abdee670ebb2776199 Mon Sep 17 00:00:00 2001 From: Azurolu Date: Wed, 16 May 2018 01:42:54 +0000 Subject: Improved french translation thanks to Chip's suggestions, added inputRadius' french translation. --- src/i18n/messages.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 4ddf3309..846d123f 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -831,8 +831,8 @@ const fr = { blocked: 'Bloqué', block: 'Bloquer', statuses: 'Statuts', - mute: 'Mettre en muet', - muted: 'Mis en muet', + mute: 'Masquer', + muted: 'Masqué', followers: 'Vous suivent', followees: 'Suivis', per_day: 'par jour', @@ -840,7 +840,7 @@ const fr = { }, timeline: { show_new: 'Afficher plus', - error_fetching: 'Erreur en cherchant des mises à jours', + error_fetching: 'Erreur en cherchant les mises à jour', up_to_date: 'À jour', load_older: 'Afficher plus', conversation: 'Conversation', @@ -869,7 +869,7 @@ const fr = { hide_attachments_in_convo: 'Masquer les pièces jointes dans les conversations', nsfw_clickthrough: 'Masquer les images marquées comme contenu adulte ou sensible', autoload: 'Charger la suite automatiquement une fois le bas de la page atteint', - reply_link_preview: 'Activer un aperçu d\'une réponse sur passage de la souris', + reply_link_preview: 'Afficher un aperçu lors du survol de liens vers une réponse', presets: 'Thèmes prédéfinis', theme_help: 'Spécifiez des codes couleur hexadécimaux (#aabbcc) pour personnaliser les couleurs du thème', background: 'Arrière plan', @@ -887,24 +887,24 @@ const fr = { cGreen: 'Vert (Partager)', btnRadius: 'Boutons', panelRadius: 'Fenêtres', - inputRadius: 'Champs de texte', + inputRadius: 'Champs de texte', avatarRadius: 'Avatars', avatarAltRadius: 'Avatars (Notifications)', tooltipRadius: 'Info-bulles/alertes ', attachmentRadius: 'Pièces jointes', - radii_help: 'Mettre en place l\'arondissement des coins de l\'interface (en pixels)', + radii_help: 'Vous pouvez ici choisir le niveau d\'arrondi des angles de l\'interface (en pixels)', stop_gifs: 'N\'animer les GIFS que lors du survol du curseur de la souris' }, notifications: { notifications: 'Notifications', read: 'Lu !', - followed_you: 'vous a suivi', + followed_you: 'a commencé à vous suivre', favorited_you: 'a aimé votre statut', repeated_you: 'a partagé votre statut' }, login: { login: 'Connexion', - username: 'Nom d\'utilisateur', + username: 'Identifiant', password: 'Mot de passe', register: 'S\'inscrire', logout: 'Déconnexion' -- cgit v1.2.3-70-g09d2 From fed87815833bfb847be192b79782f3edca99cf5f Mon Sep 17 00:00:00 2001 From: aka Date: Wed, 16 May 2018 19:51:52 -0300 Subject: fix linting --- src/components/user_settings/user_settings.js | 43 ++++++++++++++------------- src/i18n/messages.js | 2 +- 2 files changed, 24 insertions(+), 21 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 602052ca..2c08b2f8 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -141,30 +141,33 @@ const UserSettings = { /* This function takes an Array of Users * and outputs a file with all the addresses for the user to download */ - exportPeople(Users) { + exportPeople (users, filename) { // Get all the friends addresses - var UserAddresses = Users.map(function(user) { - // check is it's a local user - if(user && user.is_local) { - // append the instance address - user.screen_name += '@' + location.hostname; - } - return user.screen_name; - }).join('\n'); + var UserAddresses = users.map(function (user) { + // check is it's a local user + if (user && user.is_local) { + // append the instance address + // eslint-disable-next-line no-undef + user.screen_name += '@' + location.hostname + } + return user.screen_name + }).join('\n') // Make the user download the file - var fileToDownload = document.createElement('a'); - fileToDownload.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(UserAddresses)); - fileToDownload.setAttribute('download', 'friends.csv'); - fileToDownload.style.display = 'none'; - document.body.appendChild(fileToDownload); - fileToDownload.click(); - document.body.removeChild(fileToDownload); + var fileToDownload = document.createElement('a') + fileToDownload.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(UserAddresses)) + fileToDownload.setAttribute('download', filename) + fileToDownload.style.display = 'none' + document.body.appendChild(fileToDownload) + fileToDownload.click() + document.body.removeChild(fileToDownload) }, - exportFollows() { - this.enableFollowsExport = false; + exportFollows () { + this.enableFollowsExport = false this.$store.state.api.backendInteractor - .fetchFriends({id: this.$store.state.users.currentUser.id}) - .then(this.exportPeople); + .fetchFriends({id: this.$store.state.users.currentUser.id}) + .then(function (friendList) { + this.exportPeople(friendList, 'friends.csv') + }.bind(this)) }, followListChange () { // eslint-disable-next-line no-undef diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 473fd9b1..bb3f2d39 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -290,7 +290,7 @@ const en = { follows_imported: 'Follows imported! Processing them will take a while.', follow_import_error: 'Error importing followers', follow_export: 'Follow export', - follow_export_processing: 'Processing, you\'ll soon be aked to download your file', + follow_export_processing: 'Processing, you\'ll soon be asked to download your file', follow_export_button: 'Export your follows to a csv file' }, notifications: { -- cgit v1.2.3-70-g09d2 From 8bd561c285aa48d750cf026d4492d4169f2fb040 Mon Sep 17 00:00:00 2001 From: chip Date: Fri, 18 May 2018 21:39:21 +0200 Subject: Correct typo in french translation --- src/i18n/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index f00bb6c5..43a224ce 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -917,7 +917,7 @@ const fr = { fullname: 'Pseudonyme', email: 'Adresse email', bio: 'Biographie', - password_confirm: 'Confirmation le mot de passe' + password_confirm: 'Confirmation du mot de passe' }, post_status: { posting: 'Envoi en cours', -- cgit v1.2.3-70-g09d2 From e0ba6a587671c4e7d484152f35076c0fb1eb2996 Mon Sep 17 00:00:00 2001 From: Syldexia Date: Mon, 21 May 2018 23:01:09 +0100 Subject: Added change password to user settings --- src/components/user_settings/user_settings.js | 22 +++++++++++++++++++++- src/components/user_settings/user_settings.vue | 21 ++++++++++++++++++++- src/i18n/messages.js | 10 ++++++++-- src/services/api/api.service.js | 19 ++++++++++++++++++- .../backend_interactor_service.js | 4 +++- 5 files changed, 70 insertions(+), 6 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 1e7b9b12..b6026e18 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -13,7 +13,10 @@ const UserSettings = { previews: [ null, null, null ], deletingAccount: false, deleteAccountConfirmPasswordInput: '', - deleteAccountError: false + deleteAccountError: false, + changePasswordInputs: [ '', '', '' ], + changedPassword: false, + changePasswordError: false } }, components: { @@ -195,6 +198,23 @@ const UserSettings = { this.deleteAccountError = res.error } }) + }, + changePassword () { + const params = { + password: this.changePasswordInputs[0], + newPassword: this.changePasswordInputs[1], + newPasswordConfirmation: this.changePasswordInputs[2] + } + this.$store.state.api.backendInteractor.changePassword(params) + .then((res) => { + if (res.status === 'success') { + this.changedPassword = true + this.changePasswordError = false + } else { + this.changedPassword = false + this.changePasswordError = res.error + } + }) } } } diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index ea9763f3..fbf3f651 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -49,6 +49,25 @@ +
+

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

+
+

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

+ +
+
+

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

+ +
+
+

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

+ +
+ +

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

+

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

+

{{changePasswordError}}

+

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

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

@@ -62,7 +81,7 @@

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

- +

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

diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 19b50272..54a99b5a 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -291,12 +291,18 @@ const en = { follows_imported: 'Follows imported! Processing them will take a while.', follow_import_error: 'Error importing followers', delete_account: 'Delete Account', - delete_account_description: 'Permanantly delete your account and all your messages.', + delete_account_description: 'Permanently delete your account and all your messages.', delete_account_instructions: 'Type your password in the input below to confirm account deletion.', delete_account_error: 'There was an issue deleting your account. If this persists please contact your instance administrator.', follow_export: 'Follow export', follow_export_processing: 'Processing, you\'ll soon be asked to download your file', - follow_export_button: 'Export your follows to a csv file' + follow_export_button: 'Export your follows to a csv file', + change_password: 'Change Password', + current_password: 'Current password', + new_password: 'New password', + confirm_new_password: 'Confirm new password', + changed_password: 'Password changed successfully!', + change_password_error: 'There was an issue changing your password.' }, notifications: { notifications: 'Notifications', diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index fd401068..65761aee 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -31,6 +31,7 @@ const UNBLOCKING_URL = '/api/blocks/destroy.json' const USER_URL = '/api/users/show.json' const FOLLOW_IMPORT_URL = '/api/pleroma/follow_import' const DELETE_ACCOUNT_URL = '/api/pleroma/delete_account' +const CHANGE_PASSWORD_URL = '/api/pleroma/change_password' import { each, map } from 'lodash' import 'whatwg-fetch' @@ -387,6 +388,21 @@ const deleteAccount = ({credentials, password}) => { .then((response) => response.json()) } +const changePassword = ({credentials, password, newPassword, newPasswordConfirmation}) => { + const form = new FormData() + + form.append('password', password) + form.append('new_password', newPassword) + form.append('new_password_confirmation', newPasswordConfirmation) + + return fetch(CHANGE_PASSWORD_URL, { + body: form, + method: 'POST', + headers: authHeaders(credentials) + }) + .then((response) => response.json()) +} + const fetchMutes = ({credentials}) => { const url = '/api/qvitter/mutes.json' @@ -423,7 +439,8 @@ const apiService = { updateBanner, externalProfile, followImport, - deleteAccount + deleteAccount, + changePassword } export default apiService diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js index c5807bed..14173558 100644 --- a/src/services/backend_interactor_service/backend_interactor_service.js +++ b/src/services/backend_interactor_service/backend_interactor_service.js @@ -62,6 +62,7 @@ const backendInteractorService = (credentials) => { const followImport = ({params}) => apiService.followImport({params, credentials}) const deleteAccount = ({password}) => apiService.deleteAccount({credentials, password}) + const changePassword = ({password, newPassword, newPasswordConfirmation}) => apiService.changePassword({credentials, password, newPassword, newPasswordConfirmation}) const backendInteractorServiceInstance = { fetchStatus, @@ -85,7 +86,8 @@ const backendInteractorService = (credentials) => { updateProfile, externalProfile, followImport, - deleteAccount + deleteAccount, + changePassword } return backendInteractorServiceInstance -- cgit v1.2.3-70-g09d2 From dd437222d0bb6d9ec6f459f6f63b6619c9343969 Mon Sep 17 00:00:00 2001 From: Artik Banana Date: Tue, 5 Jun 2018 09:09:30 +0000 Subject: Update messages.js --- src/i18n/messages.js | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 1 deletion(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 54a99b5a..479e9899 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1681,6 +1681,139 @@ const nb = { } } +const he = { + chat: { + title: 'צ\'אט' + }, + nav: { + chat: 'צ\'אט מקומי', + timeline: 'ציר הזמן', + mentions: 'אזכורים', + public_tl: 'ציר הזמן הציבורי', + twkn: 'כל הרשת הידועה' + }, + user_card: { + follows_you: 'עוקב אחריך!', + following: 'עוקב!', + follow: 'עקוב', + blocked: 'חסום!', + block: 'חסימה', + statuses: 'סטטוסים', + mute: 'השתק', + muted: 'מושתק', + followers: 'עוקבים', + followees: 'נעקבים', + per_day: 'ליום', + remote_follow: 'עקיבה מרחוק' + }, + timeline: { + show_new: 'הראה חדש', + error_fetching: 'שגיאה בהבאת הודעות', + up_to_date: 'עדכני', + load_older: 'טען סטטוסים חדשים', + conversation: 'שיחה', + collapse: 'מוטט', + repeated: 'חזר' + }, + settings: { + user_settings: 'הגדרות משתמש', + name_bio: 'שם ואודות', + name: 'שם', + bio: 'אודות', + avatar: 'תמונת פרופיל', + current_avatar: 'תמונת הפרופיל הנוכחית שלך', + set_new_avatar: 'Set new avatar', + profile_banner: 'Profile Banner', + current_profile_banner: 'Your current profile banner', + set_new_profile_banner: 'Set new profile banner', + profile_background: 'Profile Background', + set_new_profile_background: 'Set new profile background', + settings: 'הגדרות', + theme: 'Theme', + presets: 'Presets', + theme_help: 'Use hex color codes (#rrggbb) to customize your color theme.', + radii_help: 'Set up interface edge rounding (in pixels)', + background: 'רקע', + foreground: 'חזית', + text: 'טקסט', + links: 'לינקים', + cBlue: 'Blue (Reply, follow)', + cRed: 'Red (Cancel)', + cOrange: 'Orange (Favorite)', + cGreen: 'Green (Retweet)', + btnRadius: 'Buttons', + inputRadius: 'Input fields', + panelRadius: 'Panels', + avatarRadius: 'Avatars', + avatarAltRadius: 'Avatars (Notifications)', + tooltipRadius: 'Tooltips/alerts', + attachmentRadius: 'Attachments', + filtering: 'Filtering', + filtering_explanation: 'All statuses containing these words will be muted, one per line', + attachments: 'Attachments', + hide_attachments_in_tl: 'Hide attachments in timeline', + hide_attachments_in_convo: 'Hide attachments in conversations', + nsfw_clickthrough: 'Enable clickthrough NSFW attachment hiding', + stop_gifs: 'Play-on-hover GIFs', + autoload: 'Enable automatic loading when scrolled to the bottom', + streaming: 'Enable automatic streaming of new posts when scrolled to the top', + reply_link_preview: 'Enable reply-link preview on mouse hover', + follow_import: 'יבוא עקיבות', + import_followers_from_a_csv_file: 'Import follows from a csv file', + follows_imported: 'Follows imported! Processing them will take a while.', + follow_import_error: 'Error importing followers', + delete_account: 'מחק משתמש', + delete_account_description: 'Permanently delete your account and all your messages.', + delete_account_instructions: 'Type your password in the input below to confirm account deletion.', + delete_account_error: 'There was an issue deleting your account. If this persists please contact your instance administrator.', + follow_export: 'יצוא עקיבות', + follow_export_processing: 'Processing, you\'ll soon be asked to download your file', + follow_export_button: 'Export your follows to a csv file', + change_password: 'שנה סיסמה', + current_password: 'סיסמה נוכחית', + new_password: 'סיסמה חדשה', + confirm_new_password: 'אשר סיסמה', + changed_password: 'סיסמה שונתה בהצלחה!', + change_password_error: 'הייתה בעיה בשינוי סיסמתך.' + }, + notifications: { + notifications: 'התראות', + read: 'קרא!', + followed_you: 'עקב אחריך!', + favorited_you: 'אהב את הסטטוס שלך', + repeated_you: 'חזר על הסטטוס שלך' + }, + login: { + login: 'התחבר', + username: 'שם המשתמש', + password: 'סיסמה', + register: 'הירשם', + logout: 'התנתק' + }, + registration: { + registration: 'הרשמה', + fullname: 'שם תצוגה', + email: 'אימייל', + bio: 'אודות', + password_confirm: 'אישור סיסמה' + }, + post_status: { + posting: 'מפרסם', + default: 'הרגע נחת ב-ל.א.' + }, + finder: { + find_user: 'מציאת משתמש', + error_fetching_user: 'שגיאה במציאת משתמש' + }, + general: { + submit: 'שלח', + apply: 'החל' + }, + user_profile: { + timeline_title: 'ציר זמן המשתמש' + } +} + const messages = { de, fi, @@ -1697,7 +1830,8 @@ const messages = { es, pt, ru, - nb + nb, + he } export default messages -- cgit v1.2.3-70-g09d2 From 8a491741710037a51653064ab321c6f10957d416 Mon Sep 17 00:00:00 2001 From: Artik Banana Date: Wed, 6 Jun 2018 17:43:36 +0000 Subject: Update messages.js --- src/i18n/messages.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 479e9899..0ed84547 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1741,14 +1741,14 @@ const he = { cRed: 'Red (Cancel)', cOrange: 'Orange (Favorite)', cGreen: 'Green (Retweet)', - btnRadius: 'Buttons', + btnRadius: 'כפתורים', inputRadius: 'Input fields', panelRadius: 'Panels', avatarRadius: 'Avatars', avatarAltRadius: 'Avatars (Notifications)', tooltipRadius: 'Tooltips/alerts', attachmentRadius: 'Attachments', - filtering: 'Filtering', + filtering: 'סינון', filtering_explanation: 'All statuses containing these words will be muted, one per line', attachments: 'Attachments', hide_attachments_in_tl: 'Hide attachments in timeline', @@ -1759,16 +1759,16 @@ const he = { streaming: 'Enable automatic streaming of new posts when scrolled to the top', reply_link_preview: 'Enable reply-link preview on mouse hover', follow_import: 'יבוא עקיבות', - import_followers_from_a_csv_file: 'Import follows from a csv file', - follows_imported: 'Follows imported! Processing them will take a while.', - follow_import_error: 'Error importing followers', + import_followers_from_a_csv_file: 'ייבא את הנעקבים שלך מקובץ csv', + follows_imported: 'נעקבים יובאו! ייקח זמן מה לעבד אותם.', + follow_import_error: 'שגיאה בייבוא נעקבים.', delete_account: 'מחק משתמש', delete_account_description: 'Permanently delete your account and all your messages.', delete_account_instructions: 'Type your password in the input below to confirm account deletion.', - delete_account_error: 'There was an issue deleting your account. If this persists please contact your instance administrator.', + delete_account_error: 'הייתה בעיה במחיקת המשתמש. אם זה ממשיך, אנא עדכן את מנהל השרת שלך.', follow_export: 'יצוא עקיבות', - follow_export_processing: 'Processing, you\'ll soon be asked to download your file', - follow_export_button: 'Export your follows to a csv file', + follow_export_processing: 'טוען. בקרוב תתבקש להוריד את הקובץ את הקובץ שלך', + follow_export_button: 'ייצא את הנעקבים שלך לקובץ csv', change_password: 'שנה סיסמה', current_password: 'סיסמה נוכחית', new_password: 'סיסמה חדשה', -- cgit v1.2.3-70-g09d2 From 72d7693f560a937ce0ad38fc1dbd1e36e8d10910 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Thu, 7 Jun 2018 19:53:08 +0200 Subject: Update translation. --- src/i18n/messages.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 54a99b5a..c4c94593 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1185,13 +1185,14 @@ const pl = { cOrange: 'Pomarańczowy (ulubione)', cGreen: 'Zielony (powtórzenia)', btnRadius: 'Przyciski', + inputRadius: 'Pola tekstowe', panelRadius: 'Panele', avatarRadius: 'Awatary', avatarAltRadius: 'Awatary (powiadomienia)', tooltipRadius: 'Etykiety/alerty', attachmentRadius: 'Załączniki', filtering: 'Filtrowanie', - filtering_explanation: 'Wszystkie statusy zawierające te słowa będą wyciszone. Jedno słowo na linijkę', + filtering_explanation: 'Wszystkie statusy zawierające te słowa będą wyciszone. Jedno słowo na linijkę.', attachments: 'Załączniki', hide_attachments_in_tl: 'Ukryj załączniki w osi czasu', hide_attachments_in_convo: 'Ukryj załączniki w rozmowach', @@ -1203,7 +1204,20 @@ const pl = { follow_import: 'Import obserwowanych', import_followers_from_a_csv_file: 'Importuj obserwowanych z pliku CSV', follows_imported: 'Obserwowani zaimportowani! Przetwarzanie może trochę potrwać.', - follow_import_error: 'Błąd przy importowaniu obserwowanych' + follow_import_error: 'Błąd przy importowaniu obserwowanych', + delete_account: 'Usuń konto', + delete_account_description: 'Trwale usuń konto i wszystkie posty.', + delete_account_instructions: 'Wprowadź swoje hasło w poniższe pole aby potwierdzić usunięcie konta.', + delete_account_error: 'Wystąpił problem z usuwaniem twojego konta. Jeżeli problem powtarza się, poinformuj administratora swojej instancji.', + follow_export: 'Eksport obserwowanych', + follow_export_processing: 'Przetwarzanie, wkrótce twój plik zacznie się ściągać.', + follow_export_button: 'Eksportuj swoją listę obserwowanych do pliku CSV', + change_password: 'Zmień hasło', + current_password: 'Obecne hasło', + new_password: 'Nowe hasło', + confirm_new_password: 'Potwierdź nowe hasło', + changed_password: 'Hasło zmienione poprawnie!', + change_password_error: 'Podczas zmiany hasła wystąpił problem.' }, notifications: { notifications: 'Powiadomienia', -- cgit v1.2.3-70-g09d2 From da444e85eeb59b940ddeb3d80de6cf75acebb2c2 Mon Sep 17 00:00:00 2001 From: Artik Banana Date: Thu, 7 Jun 2018 19:56:25 +0000 Subject: Update messages.js --- src/i18n/messages.js | 58 ++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 0ed84547..eb8f4ee3 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1722,49 +1722,49 @@ const he = { bio: 'אודות', avatar: 'תמונת פרופיל', current_avatar: 'תמונת הפרופיל הנוכחית שלך', - set_new_avatar: 'Set new avatar', - profile_banner: 'Profile Banner', - current_profile_banner: 'Your current profile banner', - set_new_profile_banner: 'Set new profile banner', - profile_background: 'Profile Background', - set_new_profile_background: 'Set new profile background', + set_new_avatar: 'קבע תמונת פרופיל חדשה', + profile_banner: 'כרזת הפרופיל', + current_profile_banner: 'כרזת הפרופיל הנוכחית שלך', + set_new_profile_banner: 'קבע כרזת פרופיל חדשה', + profile_background: 'רקע הפרופיל', + set_new_profile_background: 'קבע רקע פרופיל חדש', settings: 'הגדרות', - theme: 'Theme', - presets: 'Presets', + theme: 'תמה', + presets: 'ערכים קבועים מראש', theme_help: 'Use hex color codes (#rrggbb) to customize your color theme.', radii_help: 'Set up interface edge rounding (in pixels)', background: 'רקע', foreground: 'חזית', text: 'טקסט', links: 'לינקים', - cBlue: 'Blue (Reply, follow)', - cRed: 'Red (Cancel)', - cOrange: 'Orange (Favorite)', - cGreen: 'Green (Retweet)', + cBlue: 'כחול (תגובה, עקיבה)', + cRed: 'אדום (ביטול)', + cOrange: 'כתום (לייק)', + cGreen: 'ירוק (חזרה)', btnRadius: 'כפתורים', - inputRadius: 'Input fields', - panelRadius: 'Panels', - avatarRadius: 'Avatars', - avatarAltRadius: 'Avatars (Notifications)', - tooltipRadius: 'Tooltips/alerts', - attachmentRadius: 'Attachments', + inputRadius: 'שדות קלט', + panelRadius: 'פאנלים', + avatarRadius: 'תמונות פרופיל', + avatarAltRadius: 'תמונות פרופיל (התראות)', + tooltipRadius: 'טולטיפ \ התראות', + attachmentRadius: 'צירופים', filtering: 'סינון', - filtering_explanation: 'All statuses containing these words will be muted, one per line', - attachments: 'Attachments', - hide_attachments_in_tl: 'Hide attachments in timeline', - hide_attachments_in_convo: 'Hide attachments in conversations', - nsfw_clickthrough: 'Enable clickthrough NSFW attachment hiding', - stop_gifs: 'Play-on-hover GIFs', - autoload: 'Enable automatic loading when scrolled to the bottom', - streaming: 'Enable automatic streaming of new posts when scrolled to the top', - reply_link_preview: 'Enable reply-link preview on mouse hover', + filtering_explanation: 'כל הסטטוסים הכוללים את המילים הללו יושתקו, אחד לשורה', + attachments: 'צירופים', + hide_attachments_in_tl: 'החבא צירופים בציר הזמן', + hide_attachments_in_convo: 'החבא צירופים בשיחות', + nsfw_clickthrough: 'החל החבאת צירופים לא בטוחים לצפיה בעת עבודה בעזרת לחיצת עכבר', + stop_gifs: 'נגן-בעת-ריחוף GIFs', + autoload: 'החל טעינה אוטומטית בגלילה לתחתית הדף', + streaming: 'החל זרימת הודעות אוטומטית בעת גלילה למעלה הדף', + reply_link_preview: 'החל תצוגה מקדימה של לינק-תגובה בעת ריחוף עם העכבר', follow_import: 'יבוא עקיבות', import_followers_from_a_csv_file: 'ייבא את הנעקבים שלך מקובץ csv', follows_imported: 'נעקבים יובאו! ייקח זמן מה לעבד אותם.', follow_import_error: 'שגיאה בייבוא נעקבים.', delete_account: 'מחק משתמש', - delete_account_description: 'Permanently delete your account and all your messages.', - delete_account_instructions: 'Type your password in the input below to confirm account deletion.', + delete_account_description: 'מחק לצמיתות את המשתמש שלך ואת כל הודעותיך.', + delete_account_instructions: 'הכנס את סיסמתך בקלט למטה על מנת לאשר מחיקת משתמש.', delete_account_error: 'הייתה בעיה במחיקת המשתמש. אם זה ממשיך, אנא עדכן את מנהל השרת שלך.', follow_export: 'יצוא עקיבות', follow_export_processing: 'טוען. בקרוב תתבקש להוריד את הקובץ את הקובץ שלך', -- cgit v1.2.3-70-g09d2 From 17aa44862b86195abe457d6c1586c2cfb4894e48 Mon Sep 17 00:00:00 2001 From: Artik Banana Date: Thu, 7 Jun 2018 20:20:20 +0000 Subject: Update messages.js --- src/i18n/messages.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index eb8f4ee3..320e1d72 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1731,8 +1731,8 @@ const he = { settings: 'הגדרות', theme: 'תמה', presets: 'ערכים קבועים מראש', - theme_help: 'Use hex color codes (#rrggbb) to customize your color theme.', - radii_help: 'Set up interface edge rounding (in pixels)', + theme_help: 'השתמש בקודי צבע הקס (#אדום-אדום-ירוק-ירוק-כחול-כחול) על מנת להתאים אישית את תמת הצבע שלך.', + radii_help: 'קבע מראש עיגול פינות לממשק (בפיקסלים)', background: 'רקע', foreground: 'חזית', text: 'טקסט', -- cgit v1.2.3-70-g09d2 From da0dcdaaf8f363f4374a099db781260505f127a1 Mon Sep 17 00:00:00 2001 From: Artik Banana Date: Thu, 7 Jun 2018 20:28:16 +0000 Subject: Update messages.js --- src/i18n/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 320e1d72..f76a74e1 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1746,7 +1746,7 @@ const he = { panelRadius: 'פאנלים', avatarRadius: 'תמונות פרופיל', avatarAltRadius: 'תמונות פרופיל (התראות)', - tooltipRadius: 'טולטיפ \ התראות', + tooltipRadius: 'טולטיפ \\ התראות', attachmentRadius: 'צירופים', filtering: 'סינון', filtering_explanation: 'כל הסטטוסים הכוללים את המילים הללו יושתקו, אחד לשורה', -- cgit v1.2.3-70-g09d2 From 24eddeb3e16facfa2b88b00fa0fef043d175c967 Mon Sep 17 00:00:00 2001 From: Artik Banana Date: Thu, 7 Jun 2018 20:28:43 +0000 Subject: Update messages.js --- src/i18n/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index f76a74e1..a2014969 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1746,7 +1746,7 @@ const he = { panelRadius: 'פאנלים', avatarRadius: 'תמונות פרופיל', avatarAltRadius: 'תמונות פרופיל (התראות)', - tooltipRadius: 'טולטיפ \\ התראות', + tooltipRadius: 'טולטיפ / התראות', attachmentRadius: 'צירופים', filtering: 'סינון', filtering_explanation: 'כל הסטטוסים הכוללים את המילים הללו יושתקו, אחד לשורה', -- cgit v1.2.3-70-g09d2 From 72d9322c025b0786b3d683fca30cc7440e57bd59 Mon Sep 17 00:00:00 2001 From: Artik Banana Date: Thu, 7 Jun 2018 20:37:06 +0000 Subject: Update messages.js --- src/i18n/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index a2014969..f76a74e1 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1746,7 +1746,7 @@ const he = { panelRadius: 'פאנלים', avatarRadius: 'תמונות פרופיל', avatarAltRadius: 'תמונות פרופיל (התראות)', - tooltipRadius: 'טולטיפ / התראות', + tooltipRadius: 'טולטיפ \\ התראות', attachmentRadius: 'צירופים', filtering: 'סינון', filtering_explanation: 'כל הסטטוסים הכוללים את המילים הללו יושתקו, אחד לשורה', -- cgit v1.2.3-70-g09d2 From ca95a108e395682e27faa94f9b841975293c0f63 Mon Sep 17 00:00:00 2001 From: Astra Date: Thu, 7 Jun 2018 17:31:43 -0400 Subject: should resolve a 3/4 things --- src/components/post_status_form/post_status_form.js | 4 ++-- src/components/post_status_form/post_status_form.vue | 2 +- src/i18n/messages.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 0f8ebecd..4b715086 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -191,7 +191,7 @@ const PostStatusForm = { this.posting = true statusPoster.postStatus({ status: newStatus.status, - spoilerText: newStatus.spoilerText || undefined, + spoilerText: newStatus.spoilerText || null, visibility: newStatus.visibility, media: newStatus.files, store: this.$store, @@ -207,7 +207,7 @@ const PostStatusForm = { el.style.height = '16px' this.error = null - Object.keys(this.vis).forEach(function (x) { this.vis[x].selected = false }) + for (key in Object.keys(this.vis)) { this.vis[key].selected = false } this.vis.public.selected = true } else { this.error = data.error diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index e76850ae..dbd11a19 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -4,7 +4,7 @@