Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'fix-validate-follower-message' into 'master'

Browse Source 
Fix success message when validating group follower

Closes #612

See merge request framasoft/mobilizon!838
This commit is contained in:
Thomas Citharel 2021-03-03 08:53:17 +00:00
commit 6e27a912c4
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/i18n/en_US.json
View File

@ -956,5 +956,6 @@
"The group's avatar was changed.": "The group's avatar was changed.", "The group's avatar was changed.": "The group's avatar was changed.",
"The group's banner was changed.": "The group's banner was changed.", "The group's banner was changed.": "The group's banner was changed.",
"The group's short description was changed.": "The group's short description was changed.", "The group's short description was changed.": "The group's short description was changed.",
"No information": "No information" "No information": "No information",
"@{username}'s follow request was accepted": "@{username}'s follow request was accepted"
} }

3
js/src/i18n/fr_FR.json
View File

@ -1050,5 +1050,6 @@
"{title} ({count} todos)": "{title} ({count} todos)", "{title} ({count} todos)": "{title} ({count} todos)",
"{username} was invited to {group}": "{username} a été invité à {group}", "{username} was invited to {group}": "{username} a été invité à {group}",
"© The OpenStreetMap Contributors": "© Les Contributeur⋅ices OpenStreetMap", "© The OpenStreetMap Contributors": "© Les Contributeur⋅ices OpenStreetMap",
"No information": "Non renseigné" "No information": "Non renseigné",
"@{username}'s follow request was accepted": "@{username}'s follow request was accepted"
} }

13
js/src/views/Group/GroupFollowers.vue
View File

@ -245,11 +245,14 @@ export default class GroupFollowers extends mixins(GroupMixin) {
}, },
], ],
}); });
this.$notifier.success( const message = approved
this.$t("@{username}'s follow request was rejected", { ? this.$t("@{username}'s follow request was accepted", {
username: follower.actor.preferredUsername, username: follower.actor.preferredUsername,
}) as string })
); : this.$t("@{username}'s follow request was rejected", {
username: follower.actor.preferredUsername,
});
this.$notifier.success(message as string);
} catch (error) { } catch (error) {
console.error(error); console.error(error);
if (error.graphQLErrors && error.graphQLErrors.length > 0) { if (error.graphQLErrors && error.graphQLErrors.length > 0) {