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

Move contact to organized by

Browse Source 
And minor things

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2020-09-30 10:45:22 +02:00
parent 493a15cea1
commit e5b8d1a31d
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,7 +469,7 @@
"Decline": "Decline",
"Rename": "Rename",
"Move": "Move",
"Contact": "Contact|Contacts",
"Contact": "Contact",
"Website": "Website",
"Actor": "Actor",
"Statut": "Statut",
@ -768,5 +768,10 @@
"Pick": "Pick",
"The event will show as attributed to your personal profile.": "The event will show as attributed to your personal profile.",
"The event will show as attributed to this group.": "The event will show as attributed to this group.",
"<b>{contact}</b> will be displayed as contact.": "<b>{contact}</b> will be displayed as contact.|<b>{contact}</b> will be displayed as contacts."
"<b>{contact}</b> will be displayed as contact.": "<b>{contact}</b> will be displayed as contact.|<b>{contact}</b> will be displayed as contacts.",
"and {number} groups": "and {number} groups",
"Will allow to display and manage your participation status on the event page when using this device. Uncheck if you're using a public device.": "Will allow to display and manage your participation status on the event page when using this device. Uncheck if you're using a public device.",
"Visit event page": "Visit event page",
"Remember my participation in this browser": "Remember my participation in this browser",
"Organized by": "Organized by"
}

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

@ -101,7 +101,7 @@
"Confirmed": "Confirmé·e",
"Confirmed at": "Confirmé·e à",
"Confirmed: Will happen": "Confirmé : aura lieu",
"Contact": "Contact|Contacts",
"Contact": "Contact",
"Continue editing": "Continuer la modification",
"Cookies and Local storage": "Cookies et stockage local",
"Country": "Pays",
@ -805,5 +805,10 @@
"Group settings saved": "Paramètres du groupe sauvegardés",
"Error": "Erreur",
"Registrations are restricted by allowlisting.": "Les inscriptions sont restreintes par liste d'accès.",
"<b>{contact}</b> will be displayed as contact.": "<b>{contact}</b> sera affiché·e comme contact.|<b>{contact}</b> seront affiché·es comme contacts."
"<b>{contact}</b> will be displayed as contact.": "<b>{contact}</b> sera affiché·e comme contact.|<b>{contact}</b> seront affiché·es comme contacts.",
"and {number} groups": "et {number} groupes",
"Will allow to display and manage your participation status on the event page when using this device. Uncheck if you're using a public device.": "Permet d'afficher et de gérer le statut de votre participation sur la page de l'événement lorsque vous utilisez cet appareil. Décochez si vous utilisez un appareil public.",
"Visit event page": "Voir la page de l'événement",
"Remember my participation in this browser": "Se souvenir de ma participation dans ce navigateur",
"Organized by": "Organisé par"
}

4
js/src/views/About/AboutInstance.vue
View File

@ -105,13 +105,13 @@ export default class AboutInstance extends Vue {
if (this.isContactURL) {
return {
uri: this.config.contact,
text: this.urlToHostname(this.config.contact) || (this.$t("Contact") as string),
text: AboutInstance.urlToHostname(this.config.contact) || (this.$t("Contact") as string),
};
}
return null;
}
urlToHostname(url: string): string | null {
static urlToHostname(url: string): string | null {
try {
return new URL(url).hostname;
} catch (e) {

2
js/src/views/Event/Event.vue
View File

@ -329,7 +329,7 @@
:endsOn="event.endsOn"
/>
</event-metadata-block>
<event-metadata-block :title="$tc('Contact', event.contacts.length)">
<event-metadata-block :title="$t('Organized by')">
<popover-actor-card :actor="event.organizerActor" v-if="!event.attributedTo">
<actor-card :actor="event.organizerActor" />
</popover-actor-card>

4
js/src/views/User/Register.vue
View File

@ -180,7 +180,7 @@ export default class Register extends Vue {
config!: IConfig;
async submit(): Promise<Route | void> {
async submit(): Promise<void> {
this.sendingForm = true;
this.credentials.locale = this.$i18n.locale;
try {
@ -191,7 +191,7 @@ export default class Register extends Vue {
variables: this.credentials,
});
return this.$router.push({
this.$router.push({
name: RouteName.REGISTER_PROFILE,
params: { email: this.credentials.email },
});