potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki 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 36cdcaa864
commit c8449a0693
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
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", "Decline": "Decline",
"Rename": "Rename", "Rename": "Rename",
"Move": "Move", "Move": "Move",
"Contact": "Contact|Contacts", "Contact": "Contact",
"Website": "Website", "Website": "Website",
"Actor": "Actor", "Actor": "Actor",
"Statut": "Statut", "Statut": "Statut",
@ -768,5 +768,10 @@
"Pick": "Pick", "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 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.", "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": "Confirmé·e",
"Confirmed at": "Confirmé·e à", "Confirmed at": "Confirmé·e à",
"Confirmed: Will happen": "Confirmé : aura lieu", "Confirmed: Will happen": "Confirmé : aura lieu",
"Contact": "Contact|Contacts", "Contact": "Contact",
"Continue editing": "Continuer la modification", "Continue editing": "Continuer la modification",
"Cookies and Local storage": "Cookies et stockage local", "Cookies and Local storage": "Cookies et stockage local",
"Country": "Pays", "Country": "Pays",
@ -805,5 +805,10 @@
"Group settings saved": "Paramètres du groupe sauvegardés", "Group settings saved": "Paramètres du groupe sauvegardés",
"Error": "Erreur", "Error": "Erreur",
"Registrations are restricted by allowlisting.": "Les inscriptions sont restreintes par liste d'accès.", "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) { if (this.isContactURL) {
return { return {
uri: this.config.contact, 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; return null;
} }
urlToHostname(url: string): string | null { static urlToHostname(url: string): string | null {
try { try {
return new URL(url).hostname; return new URL(url).hostname;
} catch (e) { } catch (e) {

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

@ -329,7 +329,7 @@
:endsOn="event.endsOn" :endsOn="event.endsOn"
/> />
</event-metadata-block> </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"> <popover-actor-card :actor="event.organizerActor" v-if="!event.attributedTo">
<actor-card :actor="event.organizerActor" /> <actor-card :actor="event.organizerActor" />
</popover-actor-card> </popover-actor-card>

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

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