Merge branch 'fixes' into 'master'

Fixes

See merge request framasoft/mobilizon!570

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Special operations
+
+We added `application/ld+json` as acceptable MIME type for ActivityPub requests, so you'll need to recompile the `mime` library we use before recompiling Mobilizon:
+```
+MIX_ENV=prod mix deps.clean mime --build
+```
+
 ### Added
 
 - Possibility to login using LDAP

js/package.json

@@ -84,14 +84,14 @@
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-vue": "^6.2.2",
+    "eslint-plugin-vue": "^7.0.0",
     "graphql-cli": "^4.0.0",
     "node-sass": "^4.12.0",
     "prettier": "2.1.2",
     "prettier-eslint": "^11.0.0",
     "sass-loader": "^10.0.1",
     "typescript": "~4.0.2",
-    "vue-cli-plugin-styleguidist": "~4.32.3",
+    "vue-cli-plugin-styleguidist": "~4.32.4",
     "vue-cli-plugin-svg": "~0.1.3",
     "vue-i18n-extract": "^1.0.2",
     "vue-template-compiler": "^2.6.11",

js/src/components/Participation/ConfirmParticipation.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="container">
+  <section class="section container">
     <h1 class="title" v-if="loading">{{ $t("Your participation is being validated") }}</h1>
     <div v-else>
       <div v-if="failed">
@@ -11,7 +11,24 @@
           }}
         </b-message>
       </div>
-      <h1 class="title" v-else>{{ $t("Your participation has been validated") }}</h1>
+      <div v-else>
+        <h1 class="title">{{ $t("Your participation has been validated") }}</h1>
+        <form @submit.prevent="askToSaveParticipation">
+          <b-field>
+            <b-checkbox v-model="saveParticipation">
+              <b>{{ $t("Remember my participation in this browser") }}</b>
+              <p>
+                {{
+                  $t(
+                    "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."
+                  )
+                }}
+              </p>
+            </b-checkbox>
+          </b-field>
+          <b-button native-type="submit" type="is-primary">{{ $t("Visit event page") }}</b-button>
+        </form>
+      </div>
     </div>
   </section>
 </template>
@@ -32,6 +49,10 @@ export default class ConfirmParticipation extends Vue {
 
   failed = false;
 
+  participation!: IParticipant;
+
+  saveParticipation = true;
+
   async created(): Promise<void> {
     await this.validateAction();
   }
@@ -49,11 +70,7 @@ export default class ConfirmParticipation extends Vue {
 
       if (data) {
         const { confirmParticipation: participation } = data;
-        await confirmLocalAnonymousParticipation(participation.event.uuid);
-        await this.$router.replace({
-          name: RouteName.EVENT,
-          params: { uuid: data.confirmParticipation.event.uuid },
-        });
+        this.participation = participation;
       }
     } catch (err) {
       console.error(err);
@@ -64,5 +81,23 @@ export default class ConfirmParticipation extends Vue {
       this.loading = false;
     }
   }
+
+  askToSaveParticipation(): void {
+    if (this.saveParticipation) {
+      this.saveParticipationInBrowser();
+    }
+    this.forwardToEventPage();
+  }
+
+  async saveParticipationInBrowser(): Promise<void> {
+    await confirmLocalAnonymousParticipation(this.participation.event.uuid);
+  }
+
+  async forwardToEventPage(): Promise<void> {
+    await this.$router.replace({
+      name: RouteName.EVENT,
+      params: { uuid: this.participation.event.uuid },
+    });
+  }
 }
 </script>

js/src/graphql/statistics.ts

@@ -6,6 +6,7 @@ export const STATISTICS = gql`
       numberOfUsers
       numberOfEvents
       numberOfComments
+      numberOfGroups
     }
   }
 `;

js/src/i18n/en_US.json

@@ -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"
 }

js/src/i18n/fr_FR.json

@@ -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"
 }

js/src/services/AnonymousParticipationStorage.ts

@@ -63,8 +63,7 @@ function insertLocalAnonymousParticipation(
 
 function buildExpiration(event: IEvent): Date {
   const expiration = event.endsOn || event.beginsOn;
-  expiration.setMonth(expiration.getMonth() + 3);
-  expiration.setDate(1);
+  expiration.setMonth(expiration.getMonth() + 1);
   return expiration;
 }
 

js/src/types/statistics.model.ts

@@ -2,4 +2,5 @@ export interface IStatistics {
   numberOfUsers: number;
   numberOfEvents: number;
   numberOfComments: number;
+  numberOfGroups: number;
 }

js/src/views/About/AboutInstance.vue

@@ -13,6 +13,9 @@
         <i18n tag="p" path="Home to {number} users">
           <strong slot="number">{{ statistics.numberOfUsers }}</strong>
         </i18n>
+        <i18n tag="p" path="and {number} groups">
+          <strong slot="number">{{ statistics.numberOfGroups }}</strong>
+        </i18n>
         <i18n tag="p" path="Who published {number} events">
           <strong slot="number">{{ statistics.numberOfEvents }}</strong>
         </i18n>
@@ -102,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) {
@@ -135,10 +138,11 @@ section {
   &.contact-statistics {
     margin: 2px auto;
     .statistics {
-      display: flex;
+      display: grid;
+      grid-template-columns: repeat(auto-fit, 150px);
+      grid-template-rows: repeat(2, 1fr);
       p {
         text-align: right;
-        flex: 1;
         padding: 0 15px;
 
         & > * {

js/src/views/Event/Event.vue

@@ -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>

js/src/views/User/Register.vue

@@ -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 },
       });

js/yarn.lock

@@ -1221,9 +1221,9 @@
     mkdirp "^1.0.4"
 
 "@popperjs/core@^2.4.4":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.4.tgz#11d5db19bd178936ec89cd84519c4de439574398"
-  integrity sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg==
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.5.2.tgz#d3217d5f630766c0c92fbd55cf285ba64de0578b"
+  integrity sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA==
 
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
@@ -1302,9 +1302,9 @@
   integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
 
 "@types/express-serve-static-core@*":
-  version "4.17.12"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz#9a487da757425e4f267e7d1c5720226af7f89591"
-  integrity sha512-EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA==
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz#d9af025e925fc8b089be37423b8d1eac781be084"
+  integrity sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -1388,13 +1388,6 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a"
   integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==
 
-"@types/mini-css-extract-plugin@^0.9.1":
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/@types/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.1.tgz#d4bdde5197326fca039d418f4bdda03dc74dc451"
-  integrity sha512-+mN04Oszdz9tGjUP/c1ReVwJXxSniLd7lF++sv+8dkABxVNthg6uccei+4ssKxRHGoMmPxdn7uBdJWONSJGTGQ==
-  dependencies:
-    "@types/webpack" "*"
-
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -1416,9 +1409,9 @@
   integrity sha512-6nlq2eEh75JegDGUXis9wGTYIJpUvbori4qx++PRKQsV3YRkaqUNPNykzphniqPSZADXCouBuAnyptjUkMkhvw==
 
 "@types/node@*", "@types/node@>=6":
-  version "14.11.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.1.tgz#56af902ad157e763f9ba63d671c39cda3193c835"
-  integrity sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==
+  version "14.11.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256"
+  integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1444,9 +1437,9 @@
     "@types/prosemirror-state" "*"
 
 "@types/prosemirror-model@*", "@types/prosemirror-model@^1.7.2":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.2.tgz#9c7aff2fd62f0f56eb76e2e0eb27bf6996e6c28a"
-  integrity sha512-2l+yXvidg3AUHN07mO4Jd8Q84fo6ksFsy7LHUurLYrZ74uTahBp2fzcO49AKZMzww2EulXJ40Kl/OFaQ/7A1fw==
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.4.tgz#fdbee6af3f450cdac6ab915cec3b033c598e0c7d"
+  integrity sha512-nXDcEopJ1fqeSJhGHxQMLd1VKWfA0kRaNLvK30CZhGXOKRySk66hWyrqo9swdGzzGtGZ7VzjDkECo0L4ScYk+w==
   dependencies:
     "@types/orderedmap" "*"
 
@@ -1582,12 +1575,12 @@
   integrity sha512-wmk0xQI6Yy7Fs/il4EpOcflG4uonUpYGqvZARESLc2oy4u69fkatFLbJOeW4Q6awO15P4rduAe6xkwHevpXcUQ==
 
 "@typescript-eslint/eslint-plugin@^4.0.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1.1.tgz#78d5b18e259b13c2f4ec41dd9105af269a161a75"
-  integrity sha512-Hoxyt99EA9LMmqo/5PuWWPeWeB3mKyvibfJ1Hy5SfiUpjE8Nqp+5QNd9fOkzL66+fqvIWSIE+Ett16LGMzCGnQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz#1a23d904bf8ea248d09dc3761af530d90f39c8fa"
+  integrity sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.1.1"
-    "@typescript-eslint/scope-manager" "4.1.1"
+    "@typescript-eslint/experimental-utils" "4.3.0"
+    "@typescript-eslint/scope-manager" "4.3.0"
     debug "^4.1.1"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
@@ -1605,15 +1598,15 @@
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/experimental-utils@4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.1.tgz#52ff4e37c93113eb96385a4e6d075abece1ea72d"
-  integrity sha512-jzYsNciHoa4Z3c1URtmeT/bamYm8Dwfw6vuN3WHIE/BXb1iC4KveAnXDErTAZtPVxTYBaYn3n2gbt6F6D2rm1A==
+"@typescript-eslint/experimental-utils@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87"
+  integrity sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.1.1"
-    "@typescript-eslint/types" "4.1.1"
-    "@typescript-eslint/typescript-estree" "4.1.1"
+    "@typescript-eslint/scope-manager" "4.3.0"
+    "@typescript-eslint/types" "4.3.0"
+    "@typescript-eslint/typescript-estree" "4.3.0"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
@@ -1629,32 +1622,32 @@
     eslint-visitor-keys "^1.1.0"
 
 "@typescript-eslint/parser@^4.0.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.1.1.tgz#324b4b35e314075adbc92bd8330cf3ef0c88cf3e"
-  integrity sha512-NLIhmicpKGfJbdXyQBz9j48PA6hq6e+SDOoXy7Ak6bq1ebGqbgG+fR1UIDAuay6OjQdot69c/URu2uLlsP8GQQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.3.0.tgz#684fc0be6551a2bfcb253991eec3c786a8c063a3"
+  integrity sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.1.1"
-    "@typescript-eslint/types" "4.1.1"
-    "@typescript-eslint/typescript-estree" "4.1.1"
+    "@typescript-eslint/scope-manager" "4.3.0"
+    "@typescript-eslint/types" "4.3.0"
+    "@typescript-eslint/typescript-estree" "4.3.0"
     debug "^4.1.1"
 
-"@typescript-eslint/scope-manager@4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.1.1.tgz#bdb8526e82435f32b4ccd9dd4cec01af97b48850"
-  integrity sha512-0W8TTobCvIIQ2FsrYTffyZGAAFUyIbEHq5EYJb1m7Rpd005jrnOvKOo8ywCLhs/Bm17C+KsrUboBvBAARQVvyA==
+"@typescript-eslint/scope-manager@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7"
+  integrity sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig==
   dependencies:
-    "@typescript-eslint/types" "4.1.1"
-    "@typescript-eslint/visitor-keys" "4.1.1"
+    "@typescript-eslint/types" "4.3.0"
+    "@typescript-eslint/visitor-keys" "4.3.0"
 
 "@typescript-eslint/types@3.10.1":
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
   integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
 
-"@typescript-eslint/types@4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.1.1.tgz#57500c4a86b28cb47094c1a62f1177ea279a09cb"
-  integrity sha512-zrBiqOKYerMTllKcn+BP+i1b7LW/EbMMYytroXMxUTvFPn1smkCu0D7lSAx29fTUO4jnwV0ljSvYQtn2vNrNxA==
+"@typescript-eslint/types@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf"
+  integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==
 
 "@typescript-eslint/typescript-estree@3.10.1":
   version "3.10.1"
@@ -1670,13 +1663,13 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.1.tgz#2015a84d71303ecdb6f46efd807ac19a51aab490"
-  integrity sha512-2AUg5v0liVBsqbGxBphbJ0QbGqSRVaF5qPoTPWcxop+66vMdU1h4CCvHxTC47+Qb+Pr4l2RhXDd41JNpwcQEKw==
+"@typescript-eslint/typescript-estree@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8"
+  integrity sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw==
   dependencies:
-    "@typescript-eslint/types" "4.1.1"
-    "@typescript-eslint/visitor-keys" "4.1.1"
+    "@typescript-eslint/types" "4.3.0"
+    "@typescript-eslint/visitor-keys" "4.3.0"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -1691,12 +1684,12 @@
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/visitor-keys@4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.1.tgz#bb05664bf4bea28dc120d1da94f3027d42ab0f6f"
-  integrity sha512-/EOOXbA2ferGLG6RmCHEQ0lTTLkOlXYDgblCmQk3tIU7mTPLm4gKhFMeeUSe+bcchTUsKeCk8xcpbop5Zr/8Rw==
+"@typescript-eslint/visitor-keys@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0"
+  integrity sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw==
   dependencies:
-    "@typescript-eslint/types" "4.1.1"
+    "@typescript-eslint/types" "4.3.0"
     eslint-visitor-keys "^2.0.0"
 
 "@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
@@ -3233,12 +3226,12 @@ browserslist@4.7.0:
     node-releases "^1.1.29"
 
 browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
-  version "4.14.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.3.tgz#381f9e7f13794b2eb17e1761b4f118e8ae665a53"
-  integrity sha512-GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ==
+  version "4.14.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
+  integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
   dependencies:
-    caniuse-lite "^1.0.30001131"
-    electron-to-chromium "^1.3.570"
+    caniuse-lite "^1.0.30001135"
+    electron-to-chromium "^1.3.571"
     escalade "^3.1.0"
     node-releases "^1.1.61"
 
@@ -3540,10 +3533,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001131:
-  version "1.0.30001133"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001133.tgz#ec564c5495311299eb05245e252d589a84acd95e"
-  integrity sha512-s3XAUFaC/ntDb1O3lcw9K8MPeOW7KO3z9+GzAoBxfz1B0VdacXPMKgFUtG4KIsgmnbexmi013s9miVu4h+qMHw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
+  version "1.0.30001137"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz#6f0127b1d3788742561a25af3607a17fc778b803"
+  integrity sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==
 
 case-sensitive-paths-webpack-plugin@^2.3.0:
   version "2.3.0"
@@ -3928,9 +3921,9 @@ code-point-at@^1.0.0:
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 codemirror@^5.39.0:
-  version "5.58.0"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.58.0.tgz#1f1c4faacc8606587b6ac970f30e4fd37c61047f"
-  integrity sha512-OUK+7EgaYnLyC0F09UWjckLWvviy02IDDGTW5Zmj60a3gdGnFtUM6rVsqrfl5+YSylQVQBNfAGG4KF7tQOb4/Q==
+  version "5.58.1"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.58.1.tgz#ec6bf38ad2a17f74c61bd00cc6dc5a69bd167854"
+  integrity sha512-UGb/ueu20U4xqWk8hZB3xIfV2/SFqnSLYONiM3wTMDqko0bsYrsAkGGhqUzbRkYm89aBKPyHtuNEbVWF9FTFzw==
 
 collapse-white-space@^1.0.2:
   version "1.0.6"
@@ -5173,10 +5166,10 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.570:
-  version "1.3.570"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz#3f5141cc39b4e3892a276b4889980dabf1d29c7f"
-  integrity sha512-Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg==
+electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.571:
+  version "1.3.576"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz#2e70234484e03d7c7e90310d7d79fd3775379c34"
+  integrity sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -5424,13 +5417,13 @@ eslint-config-airbnb-base@^14.0.0:
     object.entries "^1.1.2"
 
 eslint-config-prettier@^6.0.0, eslint-config-prettier@^6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"
-  integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2"
+  integrity sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==
   dependencies:
     get-stdin "^6.0.0"
 
-eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.4:
+eslint-import-resolver-node@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
   integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
@@ -5474,23 +5467,23 @@ eslint-module-utils@^2.6.0:
     pkg-dir "^2.0.0"
 
 eslint-plugin-cypress@^2.10.3:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.11.1.tgz#a945e2774b88211e2c706a059d431e262b5c2862"
-  integrity sha512-MxMYoReSO5+IZMGgpBZHHSx64zYPSPTpXDwsgW7ChlJTF/sA+obqRbHplxD6sBStE+g4Mi0LCLkG4t9liu//mQ==
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.11.2.tgz#a8f3fe7ec840f55e4cea37671f93293e6c3e76a0"
+  integrity sha512-1SergF1sGbVhsf7MYfOLiBhdOg6wqyeV9pXUAIDIffYTGMN3dTBQS9nFAzhLsHhO+Bn0GaVM1Ecm71XUidQ7VA==
   dependencies:
     globals "^11.12.0"
 
 eslint-plugin-import@^2.20.2, eslint-plugin-import@^2.21.2:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz#92f7736fe1fde3e2de77623c838dd992ff5ffb7e"
-  integrity sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
+  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
   dependencies:
     array-includes "^3.1.1"
     array.prototype.flat "^1.2.3"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.3"
+    eslint-import-resolver-node "^0.3.4"
     eslint-module-utils "^2.6.0"
     has "^1.0.3"
     minimatch "^3.0.4"
@@ -5506,14 +5499,15 @@ eslint-plugin-prettier@^3.1.3:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-vue@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe"
-  integrity sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==
+eslint-plugin-vue@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0.tgz#abaf59dec3aa50228b37a89ca1239893c96c981f"
+  integrity sha512-SFcM8ZMdVRUQKrAryl6Q5razrJtloATUOKTZoK/8yvQig1c1L3VRoMLL9AXiV3VNsKXolkk6yeMIiqGf33/Iew==
   dependencies:
+    eslint-utils "^2.1.0"
     natural-compare "^1.4.0"
-    semver "^5.6.0"
-    vue-eslint-parser "^7.0.0"
+    semver "^7.3.2"
+    vue-eslint-parser "^7.1.0"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -5523,7 +5517,7 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.0.0, eslint-scope@^5.1.0:
+eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -5599,9 +5593,9 @@ eslint@^6.8.0:
     v8-compile-cache "^2.0.3"
 
 eslint@^7.7.0:
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
-  integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9"
+  integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@eslint/eslintrc" "^0.1.3"
@@ -5611,7 +5605,7 @@ eslint@^7.7.0:
     debug "^4.0.1"
     doctrine "^3.0.0"
     enquirer "^2.3.5"
-    eslint-scope "^5.1.0"
+    eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
     eslint-visitor-keys "^1.3.0"
     espree "^7.3.0"
@@ -7051,10 +7045,10 @@ highlight.js@^9.6.0:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.3.tgz#a1a0a2028d5e3149e2380f8a865ee8516703d634"
   integrity sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ==
 
-highlight.js@~10.1.0:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz#c20db951ba1c22c055010648dfffd7b2a968e00c"
-  integrity sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA==
+highlight.js@~10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.2.0.tgz#367151bcf813adebc54822f1cb51d2e1e599619f"
+  integrity sha512-OryzPiqqNCfO/wtFo619W+nPYALM6u7iCQkum4bqRmmlcTikOkmlL06i009QelynBPAlNByTQU6cBB2cOBQtCw==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -7639,9 +7633,9 @@ is-buffer@^2.0.0, is-buffer@~2.0.3:
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
 is-callable@^1.1.4, is-callable@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.1.tgz#4d1e21a4f437509d25ce55f8184350771421c96d"
-  integrity sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
 
 is-ci@1.2.1, is-ci@^1.0.10:
   version "1.2.1"
@@ -8836,12 +8830,12 @@ lowercase-keys@^2.0.0:
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
 lowlight@^1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.14.0.tgz#83ebc143fec0f9e6c0d3deffe01be129ce56b108"
-  integrity sha512-N2E7zTM7r1CwbzwspPxJvmjAbxljCPThTFawEX2Z7+P3NGrrvY54u8kyU16IY4qWfoVIxY8SYCS8jTkuG7TqYA==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.15.0.tgz#51a8888852493cbbe4a7f39919b237a1d502c18c"
+  integrity sha512-GhG/R+2zt5Wg8kCfOhapH8wDdJSHSIvdDW/DOPXCeResVqgHYLnOHBp6g9DoUIPVIyBpvQYCG4SV7XeelYFpyA==
   dependencies:
     fault "^1.0.0"
-    highlight.js "~10.1.0"
+    highlight.js "~10.2.0"
 
 lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3, lru-cache@^4.1.5:
   version "4.1.5"
@@ -9115,11 +9109,16 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.44.0:
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
   integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
+"mime-db@>= 1.43.0 < 2":
+  version "1.45.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
+
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
@@ -9752,9 +9751,9 @@ oas-linter@^3.1.0:
     yaml "^1.10.0"
 
 oas-resolver@^2.3.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/oas-resolver/-/oas-resolver-2.5.0.tgz#b8f1d784da87c819fc4448f24aba13193d98c549"
-  integrity sha512-69OF0iCTDXXp3ttAEPUcCz/eSJd6eyrWAIrPit2wnL7Q4Ti82Q2dXQVMdz5S+JPCgtZOETnTgPs/EsMuH2vIzg==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/oas-resolver/-/oas-resolver-2.5.1.tgz#d129b4f62bd21021184d765747b72d559e864c62"
+  integrity sha512-MdMY8YAnCdFTAt5+CTC/aYEOSIFt+ICOWxQvKKxsIHjc0/0tG6V4DzbkHW9SWWqUmDPiHDxJsi79kjsE/1PJ5g==
   dependencies:
     node-fetch-h2 "^2.3.0"
     oas-kit-common "^1.0.8"
@@ -10484,9 +10483,9 @@ performance-now@^2.1.0:
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 phoenix@^1.4.11:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/phoenix/-/phoenix-1.5.4.tgz#d42bb537f03f55076b4e7a6757fe29318a8439f0"
-  integrity sha512-mTxseCKWDgrBQRIriqzvxL+QH5xruu6KQPqFdDx0jrdu/nqWCo914MLihVksn7SV2Bol3T+e/VtovJgC5UZT+w==
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/phoenix/-/phoenix-1.5.5.tgz#0db2b7fb8c798c594cab91e16995afedd3d2e228"
+  integrity sha512-4QenJ+pEFZvAqA73uFXhkRAWZhGYaV+IN1pAJ3SHamsFkPAYkTnyvFZmU6HxzxnZxDts5gNox/XzzUE6lY9eLg==
 
 picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
   version "2.2.2"
@@ -10648,9 +10647,9 @@ postcss-discard-overridden@^4.0.1:
     postcss "^7.0.0"
 
 postcss-load-config@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.1.tgz#0a684bb8beb05e55baf922f7ab44c3edb17cf78e"
-  integrity sha512-D2ENobdoZsW0+BHy4x1CAkXtbXtYWYRIxL/JbtRBqrRGOPtJ2zoga/bEZWhV/ShWB5saVxJMzbMdSyA/vv4tXw==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
+  integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==
   dependencies:
     cosmiconfig "^5.0.0"
     import-cwd "^2.0.0"
@@ -10919,13 +10918,14 @@ postcss-selector-parser@^3.0.0:
     uniq "^1.0.1"
 
 postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
-  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
+  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
   dependencies:
     cssesc "^3.0.0"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
+    util-deprecate "^1.0.2"
 
 postcss-svgo@^4.0.2:
   version "4.0.2"
@@ -10967,9 +10967,9 @@ postcss@^5.2.17:
     supports-color "^3.2.3"
 
 postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.34"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.34.tgz#f2baf57c36010df7de4009940f21532c16d65c20"
-  integrity sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==
+  version "7.0.35"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
+  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -12857,7 +12857,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.13, source-map-support@~0.5.12:
+source-map-support@^0.5.13, source-map-support@~0.5.12, source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -12887,7 +12887,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
+source-map@^0.7.3, source-map@~0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -13546,13 +13546,13 @@ terser@^4.1.2, terser@^4.6.12:
     source-map-support "~0.5.12"
 
 terser@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.2.tgz#f4bea90eb92945b2a028ceef79181b9bb586e7af"
-  integrity sha512-H67sydwBz5jCUA32ZRL319ULu+Su1cAoZnnc+lXnenGRYWyLE3Scgkt8mNoAsMx0h5kdo758zdoS0LG9rYZXDQ==
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.3.tgz#2592a1cf079df55101fe2b2cb2330f951863860b"
+  integrity sha512-vRQDIlD+2Pg8YMwVK9kMM3yGylG95EIwzBai1Bw7Ot4OBfn3VP1TZn3EWx4ep2jERN/AmnVaTiGuelZSN7ds/A==
   dependencies:
     commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
+    source-map "~0.7.2"
+    source-map-support "~0.5.19"
 
 text-table@0.2.0, text-table@^0.2.0:
   version "0.2.0"
@@ -14296,7 +14296,7 @@ utf-8-validate@^5.0.2:
   dependencies:
     node-gyp-build "~3.7.0"
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -14442,12 +14442,12 @@ vue-class-component@^7.2.3:
   resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-7.2.6.tgz#8471e037b8e4762f5a464686e19e5afc708502e4"
   integrity sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==
 
-vue-cli-plugin-styleguidist@~4.32.3:
-  version "4.32.3"
-  resolved "https://registry.yarnpkg.com/vue-cli-plugin-styleguidist/-/vue-cli-plugin-styleguidist-4.32.3.tgz#efc3af5ee1ca48783eaed6a2cfd24fe8dc04bcce"
-  integrity sha512-R0mCTJxvTxikmlUPEgLfl9+Rdl0Rk4yqfFiAiFdcu9HTtfDAjxdTpxx1Rspbk66eMikG6ZB9D/zNiqEDmzZgUw==
+vue-cli-plugin-styleguidist@~4.32.4:
+  version "4.32.4"
+  resolved "https://registry.yarnpkg.com/vue-cli-plugin-styleguidist/-/vue-cli-plugin-styleguidist-4.32.4.tgz#f5eaffa0689cb4405fe0a92c1ced9364d588b0b2"
+  integrity sha512-f68G7xcOLIeqmFuDDdxgU8Gh3HNjWF9QTyb2iWoetZtGTa9veJR7GRK27g5bEwyEpHSxGBFdz7T6NUYjgRLmhg==
   dependencies:
-    vue-styleguidist "^4.32.3"
+    vue-styleguidist "^4.32.4"
     webpack-merge "^4.2.1"
 
 vue-cli-plugin-svg@~0.1.3:
@@ -14461,10 +14461,10 @@ vue-cli-plugin-svg@~0.1.3:
     url-loader "^2.0.0"
     vue-svg-loader "^0.12.0"
 
-vue-docgen-api@^4.32.1:
-  version "4.32.1"
-  resolved "https://registry.yarnpkg.com/vue-docgen-api/-/vue-docgen-api-4.32.1.tgz#1622b1db76d73547a7686f46ef9078b957b2a376"
-  integrity sha512-N9xI2OZ+0aZgJrHzTEkNCOu2EBGUWkofJIVMZCQ9Z/IrMsEoezWGQ17qkcqlLpxepgl4NCjPBNZqqb6TZCCMlA==
+vue-docgen-api@^4.32.4:
+  version "4.32.4"
+  resolved "https://registry.yarnpkg.com/vue-docgen-api/-/vue-docgen-api-4.32.4.tgz#a74f4dfce99a078a4a87dcb779c6cdd480eeab01"
+  integrity sha512-dtPOg9uCnclBOiWASMDMBjYhrXbRDlADZNTMkc5NtF1eSXzltN7GvB7P3YO92M5IvUeHwq84A9BqGBBbye5oWg==
   dependencies:
     "@babel/parser" "^7.6.0"
     "@babel/types" "^7.6.0"
@@ -14478,7 +14478,7 @@ vue-docgen-api@^4.32.1:
     ts-map "^1.0.3"
     vue-inbrowser-compiler-utils "^4.32.1"
 
-vue-eslint-parser@^7.0.0, vue-eslint-parser@~7.1.0:
+vue-eslint-parser@^7.0.0, vue-eslint-parser@^7.1.0, vue-eslint-parser@~7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz#9cdbcc823e656b087507a1911732b867ac101e83"
   integrity sha512-Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q==
@@ -14532,16 +14532,13 @@ vue-inbrowser-compiler@^4.32.1:
     walkes "^0.2.1"
 
 "vue-loader-v16@npm:vue-loader@^16.0.0-beta.7":
-  version "16.0.0-beta.7"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.0.0-beta.7.tgz#6f2726fa0e2b1fbae67895c47593bbf69f2b9ab8"
-  integrity sha512-xQ8/GZmRPdQ3EinnE0IXwdVoDzh7Dowo0MowoyBuScEBXrRabw6At5/IdtD3waKklKW5PGokPsm8KRN6rvQ1cw==
+  version "16.0.0-beta.8"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.0.0-beta.8.tgz#1f523d9fea8e8c6e4f5bb99fd768165af5845879"
+  integrity sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==
   dependencies:
-    "@types/mini-css-extract-plugin" "^0.9.1"
-    chalk "^3.0.0"
+    chalk "^4.1.0"
     hash-sum "^2.0.0"
-    loader-utils "^1.2.3"
-    merge-source-map "^1.1.0"
-    source-map "^0.6.1"
+    loader-utils "^2.0.0"
 
 vue-loader@^15.9.2:
   version "15.9.3"
@@ -14572,9 +14569,9 @@ vue-resize@^0.4.5:
   integrity sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==
 
 vue-router@^3.1.6:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz#fa93768616ee338aa174f160ac965167fa572ffa"
-  integrity sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A==
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz#d396ec037b35931bdd1e9b7edd86f9788dc15175"
+  integrity sha512-ioRY5QyDpXM9TDjOX6hX79gtaMXSVDDzSlbIlyAmbHNteIL81WIVB2e+jbzV23vzxtoV0krdS2XHm+GxFg+Nxg==
 
 vue-scrollto@^2.17.1:
   version "2.18.2"
@@ -14591,10 +14588,10 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-styleguidist@^4.32.3:
-  version "4.32.3"
-  resolved "https://registry.yarnpkg.com/vue-styleguidist/-/vue-styleguidist-4.32.3.tgz#63ecee2abf4fe422603360398c4549daa4147679"
-  integrity sha512-mN0j5nm/dwB51FLzJb+WhBR5tPzJMn8nAke5fg65SCsJQn+AdizB13XuBYjDTFajwm4fUIbci4l+ao8gneY3EQ==
+vue-styleguidist@^4.32.4:
+  version "4.32.4"
+  resolved "https://registry.yarnpkg.com/vue-styleguidist/-/vue-styleguidist-4.32.4.tgz#3b70cf5f6fc6e53fc8cd8fcf523b19da2a4fcddf"
+  integrity sha512-TNTNphOvOO6caoj3R9CSK0sOuRiAEUFt2zTg2fXYqeEUhIwzBTaxK047XQ5z50a4MABv2XORy3cwy522kdEAaQ==
   dependencies:
     "@vxna/mini-html-webpack-template" "^1.0.0"
     ast-types "^0.13.3"
@@ -14644,7 +14641,7 @@ vue-styleguidist@^4.32.3:
     style-loader "^1.0.0"
     terser-webpack-plugin "^2.2.2"
     to-ast "^1.0.0"
-    vue-docgen-api "^4.32.1"
+    vue-docgen-api "^4.32.4"
     vue-inbrowser-compiler "^4.32.1"
     vue-inbrowser-compiler-utils "^4.32.1"
     webpack-dev-server "^3.11.0"

lib/federation/activity_pub/activity_pub.ex

@@ -872,7 +872,7 @@ defmodule Mobilizon.Federation.ActivityPub do
            event_person_participation_changed: participant.actor.id
          ),
          {:ok, _} <-
-           Scheduler.before_event_notification(participant),
+           Scheduler.trigger_notifications_for_participant(participant),
          participant_as_data <- Convertible.model_to_as(participant),
          audience <-
            Audience.calculate_to_and_cc_from_mentions(participant),

lib/graphql/resolvers/participant.ex

@@ -136,7 +136,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
   end
 
   @doc """
-  Leave an event for an actor
+  Leave an event for an anonymous actor
   """
   def actor_leave_event(
         _parent,

lib/graphql/resolvers/statistics.ex

@@ -13,7 +13,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Statistics do
      %{
        number_of_users: StatisticsModule.get_cached_value(:local_users),
        number_of_events: StatisticsModule.get_cached_value(:local_events),
-       number_of_comments: StatisticsModule.get_cached_value(:local_comments)
+       number_of_comments: StatisticsModule.get_cached_value(:local_comments),
+       number_of_groups: StatisticsModule.get_cached_value(:local_groups)
      }}
   end
 end

lib/graphql/schema/statistics.ex

@@ -12,6 +12,7 @@ defmodule Mobilizon.GraphQL.Schema.StatisticsType do
     field(:number_of_users, :integer, description: "The number of local users")
     field(:number_of_events, :integer, description: "The number of local events")
     field(:number_of_comments, :integer, description: "The number of local comments")
+    field(:number_of_groups, :integer, description: "The number of local groups")
   end
 
   object :statistics_queries do

lib/mobilizon/actors/actors.ex

@@ -603,6 +603,25 @@ defmodule Mobilizon.Actors do
   """
   def delete_group!(%Actor{type: :Group} = group), do: Repo.delete!(group)
 
+  @doc """
+  Counts the local groups
+  """
+  @spec count_local_groups :: integer()
+  def count_local_groups do
+    groups_query()
+    |> filter_local()
+    |> Repo.aggregate(:count)
+  end
+
+  @doc """
+  Counts all the groups
+  """
+  @spec count_groups :: integer()
+  def count_groups do
+    groups_query()
+    |> Repo.aggregate(:count)
+  end
+
   @doc """
   Lists the groups.
   """

lib/mobilizon/discussions/discussions.ex

@@ -288,6 +288,12 @@ defmodule Mobilizon.Discussions do
   @spec count_local_comments :: integer
   def count_local_comments, do: Repo.one(count_local_comments_query())
 
+  @doc """
+  Counts all comments.
+  """
+  @spec count_comments :: integer
+  def count_comments, do: Repo.one(count_comments_query())
+
   def get_discussion(discussion_id) do
     Discussion
     |> Repo.get(discussion_id)
@@ -424,6 +430,15 @@ defmodule Mobilizon.Discussions do
     )
   end
 
+  @spec count_comments_query :: Ecto.Query.t()
+  defp count_comments_query do
+    from(
+      c in Comment,
+      select: count(c.id),
+      where: c.visibility in ^@public_visibility
+    )
+  end
+
   @spec preload_for_comment(Ecto.Query.t()) :: Ecto.Query.t()
   defp preload_for_comment(query), do: preload(query, ^@comment_preloads)
 end

lib/mobilizon/events/events.ex

@@ -491,6 +491,17 @@ defmodule Mobilizon.Events do
     |> Repo.one()
   end
 
+  @doc """
+  Counts all events.
+  """
+  @spec count_events :: integer
+  def count_events do
+    count_events_query()
+    |> filter_unlisted_and_public_visibility()
+    |> filter_draft()
+    |> Repo.one()
+  end
+
   @doc """
   Builds a page struct for events by their name.
   """
@@ -1417,6 +1428,11 @@ defmodule Mobilizon.Events do
     from(e in Event, select: count(e.id), where: e.local == ^true)
   end
 
+  @spec count_events_query :: Ecto.Query.t()
+  defp count_events_query do
+    from(e in Event, select: count(e.id))
+  end
+
   @spec tag_by_slug_query(String.t()) :: Ecto.Query.t()
   defp tag_by_slug_query(slug) do
     from(t in Tag, where: t.slug == ^slug)
@@ -1537,7 +1553,7 @@ defmodule Mobilizon.Events do
     from(
       p in Participant,
       where: p.event_id == ^event_id,
-      preload: [:actor]
+      preload: [:actor, :event]
     )
   end
 

lib/service/notifications/scheduler.ex

@@ -10,6 +10,14 @@ defmodule Mobilizon.Service.Notifications.Scheduler do
   alias Mobilizon.Users.{Setting, User}
   require Logger
 
+  @spec trigger_notifications_for_participant(Participant.t()) :: {:ok, nil}
+  def trigger_notifications_for_participant(%Participant{} = participant) do
+    before_event_notification(participant)
+    on_day_notification(participant)
+    weekly_notification(participant)
+    {:ok, nil}
+  end
+
   def before_event_notification(%Participant{
         id: participant_id,
         event: %Event{begins_on: begins_on},

lib/service/statistics/statistics.ex

@@ -3,7 +3,7 @@ defmodule Mobilizon.Service.Statistics do
   A module that provides cached statistics
   """
 
-  alias Mobilizon.{Discussions, Events, Users}
+  alias Mobilizon.{Actors, Discussions, Events, Users}
 
   def get_cached_value(key) do
     case Cachex.fetch(:statistics, key, fn key ->
@@ -28,4 +28,20 @@ defmodule Mobilizon.Service.Statistics do
   defp create_cache(:local_comments) do
     Discussions.count_local_comments()
   end
+
+  defp create_cache(:local_groups) do
+    Actors.count_local_groups()
+  end
+
+  defp create_cache(:federation_events) do
+    Events.count_events()
+  end
+
+  defp create_cache(:federation_comments) do
+    Discussions.count_comments()
+  end
+
+  defp create_cache(:federation_groups) do
+    Actors.count_groups()
+  end
 end

lib/web/email/participation.ex

@@ -9,7 +9,7 @@ defmodule Mobilizon.Web.Email.Participation do
 
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Config
-  alias Mobilizon.Events.Participant
+  alias Mobilizon.Events.{Event, Participant}
   alias Mobilizon.Users
   alias Mobilizon.Users.User
   alias Mobilizon.Web.{Email, Gettext}
@@ -80,6 +80,27 @@ defmodule Mobilizon.Web.Email.Participation do
     |> render(:event_participation_rejected)
   end
 
+  @spec participation_updated(String.t(), Participant.t(), String.t()) :: Bamboo.Email.t()
+  def participation_updated(
+        email,
+        %Participant{event: %Event{join_options: :free} = event, role: :participant},
+        locale
+      ) do
+    Gettext.put_locale(locale)
+
+    subject =
+      gettext(
+        "Your participation to event %{title} has been confirmed",
+        title: event.title
+      )
+
+    Email.base_email(to: email, subject: subject)
+    |> assign(:locale, locale)
+    |> assign(:event, event)
+    |> assign(:subject, subject)
+    |> render(:event_participation_confirmed)
+  end
+
   @spec participation_updated(String.t(), Participant.t(), String.t()) :: Bamboo.Email.t()
   def participation_updated(
         email,

lib/web/templates/email/anonymous_participation_confirmation.html.eex

@@ -39,13 +39,6 @@
           </p>
         </td>
       </tr>
-      <tr>
-        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
-          <p style="margin: 0">
-            <%= ngettext "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.", "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.", 1 %>
-          </p>
-        </td>
-      </tr>
       <!-- BULLETPROOF BUTTON -->
       <tr>
         <td bgcolor="#ffffff" align="left">
@@ -64,6 +57,13 @@
           </table>
         </td>
       </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <p style="margin: 0">
+            <%= ngettext "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.", "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.", 1 %>
+          </p>
+        </td>
+      </tr>
       <tr>
         <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #757199; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >
           <p style="margin: 0">

lib/web/templates/email/event_participation_approved.html.eex

@@ -35,7 +35,7 @@
       <tr>
         <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
           <p style="margin: 0;">
-            <%= gettext "You recently requested to attend %{title}.", title: @event.title %>
+            <%= gettext("You recently requested to attend <b>%{title}</b>.", title: @event.title) |> raw %>
           </p>
         </td>
       </tr>

lib/web/templates/email/event_participation_confirmed.html.eex

@@ -0,0 +1,81 @@
+<!-- HERO -->
+<tr>
+  <td bgcolor="#474467" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <tr>
+        <td bgcolor="#ffffff" align="center" valign="top" style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;">
+          <h1 style="font-size: 48px; font-weight: 400; margin: 0;">
+            <%= gettext "You're going!" %>
+          </h1>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>
+<!-- COPY BLOCK -->
+<tr>
+  <td bgcolor="#E6E4F4" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <!-- COPY -->
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <p style="margin: 0;">
+            <%= gettext("You recently requested to attend <b>%{title}</b>.", title: @event.title) |> raw %>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <p style="margin: 0">
+            <%= gettext "You have now confirmed your participation. Update your calendar, because you're on the guest list now!" %>
+          </p>
+        </td>
+      </tr>
+      <!-- BULLETPROOF BUTTON -->
+      <tr>
+        <td bgcolor="#ffffff" align="left">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td bgcolor="#ffffff" align="center" style="padding: 20px 30px 60px 30px;">
+                <table border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td align="center" style="border-radius: 3px;" bgcolor="#3C376E"><a href="<%= page_url(Mobilizon.Web.Endpoint, :event, @event.uuid) %>" target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;">
+                        <%= gettext "Visit event page" %>
+                      </a></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <p style="margin: 0">
+            <%= gettext "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button." %>
+          </p>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>

lib/web/templates/email/event_participation_confirmed.text.eex

@@ -0,0 +1,6 @@
+<%= gettext "You're going!" %>
+==
+<%= gettext "You recently requested to attend %{title}.", title: @event.title %>
+<%= gettext "You have confirmed your participation. Update your calendar, because you're on the guest list now!" %>
+<%= page_url(Mobilizon.Web.Endpoint, :event, @event.uuid) %>
+<%= gettext "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button." %>

mix.exs

@@ -95,8 +95,8 @@ defmodule Mobilizon.Mixfile do
       {:ex_ical, "~> 0.2"},
       {:bamboo, "~> 1.5"},
       {:bamboo_smtp, "~> 3.0"},
-      {:geolix, "~> 1.0"},
-      {:geolix_adapter_mmdb2, "~> 0.5.0"},
+      {:geolix, "~> 2.0"},
+      {:geolix_adapter_mmdb2, "~> 0.6.0"},
       {:absinthe, "~> 1.5.2"},
       {:absinthe_phoenix, "~> 2.0.0"},
       {:absinthe_plug, "~> 1.5.0"},
@@ -147,7 +147,7 @@ defmodule Mobilizon.Mixfile do
       {:credo, "~> 1.4.0", only: [:dev, :test], runtime: false},
       {:mock, "~> 0.3.4", only: :test},
       {:elixir_feed_parser, "~> 2.1.0", only: :test},
-      {:mox, "~> 0.5", only: :test}
+      {:mox, "~> 1.0", only: :test}
     ] ++ oauth_deps()
   end
 

mix.lock

@@ -11,7 +11,7 @@
   "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
   "cachex": {:hex, :cachex, "3.3.0", "6f2ebb8f27491fe39121bd207c78badc499214d76c695658b19d6079beeca5c2", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "d90e5ee1dde14cef33f6b187af4335b88748b72b30c038969176cd4e6ccc31a1"},
   "certifi": {:hex, :certifi, "2.5.2", "b7cfeae9d2ed395695dd8201c57a2d019c0c43ecaf8b8bcb9320b40d6662f340", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040"},
-  "cldr_utils": {:hex, :cldr_utils, "2.10.0", "d6daaa0b21f28c8fb38450a8f82e0c2c7c17782a1479bd276829c2d87c01321a", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "10d1dc2c0918245271a4e90b94247eb02a296e2bf98069c3886d3be1e770495b"},
+  "cldr_utils": {:hex, :cldr_utils, "2.12.0", "d8ec28fdd8f92ff94fe0830e900786f54e71027c6bd37dec64274f7150210ffb", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "9a28b98daa8c18fb60f70c4ae97d3e5d25c5c2800e52a286e68f975ced621cc5"},
   "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
   "comeonin": {:hex, :comeonin, "5.3.1", "7fe612b739c78c9c1a75186ef2d322ce4d25032d119823269d0aa1e2f1e20025", [:mix], [], "hexpm", "d6222483060c17f0977fad1b7401ef0c5863c985a64352755f366aee3799c245"},
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm", "4a0850c9be22a43af9920a71ab17c051f5f7d45c209e40269a1938832510e4d9"},
@@ -35,11 +35,11 @@
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "esaml": {:git, "git://github.com/wrren/esaml.git", "2cace5778e4323216bcff2085ca9739e42a68a42", [branch: "ueberauth_saml"]},
   "eternal": {:hex, :eternal, "1.2.1", "d5b6b2499ba876c57be2581b5b999ee9bdf861c647401066d3eeed111d096bc4", [:mix], [], "hexpm", "b14f1dc204321429479c569cfbe8fb287541184ed040956c8862cb7a677b8406"},
-  "ex_cldr": {:hex, :ex_cldr, "2.17.0", "ca81696124b2acee60d111a56f20b29dcdeec4c3da57f878b86c1731efaf87ec", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:cldr_utils, "~> 2.9", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.13", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "0a6b42f39e16fee74192a91e1744b3e62fd9d643c85e37c8017f7f7ad4d2e1e5"},
-  "ex_cldr_calendars": {:hex, :ex_cldr_calendars, "1.10.0", "733d8bbc1fa4e5c1836cda0733664e17cf1aa6a75d407786c03cc8c3a26a6a82", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:earmark, "~> 1.0", [hex: :earmark, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.13", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_cldr_units, "~> 3.0", [hex: :ex_cldr_units, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a9842b8f3052e28f155a019e791f177f50d0da54cc41869f70d111ea907c9969"},
-  "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.6.2", "b7e9e0075d0e90faae24ee2cb1c7eb5b53e547f2d8a5445a78ebc284c4ea5f83", [:mix], [{:ex_cldr, "~> 2.14", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "89dd1913ca3d95c27579564a2abec3fa45b6847a304ffaac6a16f960615cb798"},
-  "ex_cldr_dates_times": {:hex, :ex_cldr_dates_times, "2.5.2", "ccd2d0e86e9795fe2d589ea97846aa9e3402f3070987807f10a3074d2facd16f", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:ex_cldr_calendars, "~> 1.8", [hex: :ex_cldr_calendars, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.15", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "66e5ad1db529b2ab3d2751ae4ca844d60e4d0e2721434c618179c0dd3c789704"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.15.3", "1fc5f5b3be542664797ea9483d2f1fff7d3c0565ffef0dec4bc53e0b610484fa", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.15", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.5", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "890a0f6286f5ff40d22d70ff35e035729622734f958516ba27a01f804b3ff029"},
+  "ex_cldr": {:hex, :ex_cldr, "2.17.1", "95d6f889abd063b7b350e701c6b7f76f7a87e7891bf73c8db886aac1736565a6", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:cldr_utils, "~> 2.9", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.13", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "9d8cc34bf627e6b133ab89d456acddee063be8c401220d94cc4dd7694877faad"},
+  "ex_cldr_calendars": {:hex, :ex_cldr_calendars, "1.10.1", "7e45fd1a26711d644c599e06df132669117bee2ff8e54b93f15e14720f821a9b", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:earmark, "~> 1.0", [hex: :earmark, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.13", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_cldr_units, "~> 3.0", [hex: :ex_cldr_units, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "82a024b160719050e1245a67c62c3be535ddeac70d8c25e0ff1ae69f860da4d1"},
+  "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.7.0", "d302aa589b4c2a28bc274b1944f879c2505aaf52f9427b04687420d55e317b8b", [:mix], [{:ex_cldr, "~> 2.14", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "b47efd833d5297b3644ff2b59a1d3a0c4b90214847626fbd9e52bcc3db7900b2"},
+  "ex_cldr_dates_times": {:hex, :ex_cldr_dates_times, "2.5.4", "18143155be8146a3a8b3def620dc4e54b9676143e381519370b2b3fcf8deefbc", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:ex_cldr_calendars, "~> 1.8", [hex: :ex_cldr_calendars, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.15", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "a9cf13e6c4a42005a817cd20f82b06697595edee741b60379fbf6a207ca6134b"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.15.4", "1cdeb1f6a22f31e7155edde7d51b3c95ddf6ccf60252a175c10967d4031baebd", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.15", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.6", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "1765b8579b4df5b9fec09bb5506841bf4a51d3dba2c51046e6af05a08fbe7ee1"},
   "ex_crypto": {:hex, :ex_crypto, "0.10.0", "af600a89b784b36613a989da6e998c1b200ff1214c3cfbaf8deca4aa2f0a1739", [:mix], [{:poison, ">= 2.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm", "ccc7472cfe8a0f4565f97dce7e9280119bf15a5ea51c6535e5b65f00660cde1c"},
   "ex_doc": {:hex, :ex_doc, "0.22.6", "0fb1e09a3e8b69af0ae94c8b4e4df36995d8c88d5ec7dbd35617929144b62c00", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "1e0aceda15faf71f1b0983165e6e7313be628a460e22a031e32913b98edbd638"},
   "ex_ical": {:hex, :ex_ical, "0.2.0", "4b928b554614704016cc0c9ee226eb854da9327a1cc460457621ceacb1ac29a6", [:mix], [{:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: false]}], "hexpm", "db76473b2ae0259e6633c6c479a5a4d8603f09497f55c88f9ef4d53d2b75befb"},
@@ -47,7 +47,7 @@
   "ex_optimizer": {:hex, :ex_optimizer, "0.1.0", "1d12f7ea289092a38a794b84bd2f42c1e0621cb307c0f3e6a7df620839af2937", [:mix], [{:file_info, "~> 0.0.4", [hex: :file_info, repo: "hexpm", optional: false]}], "hexpm", "a409cb91472e08d4791a129effe4687982f85e2debcb4ccb1a3711a36bfdc428"},
   "ex_unit_notifier": {:hex, :ex_unit_notifier, "0.1.4", "36a2dcab829f506e01bf17816590680dd1474407926d43e64c1263e627c364b8", [:mix], [], "hexpm", "fddf5054dd5fd2f809e837b749570baa5c9798e11d0163921baec49b7d5762f2"},
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
-  "excoveralls": {:hex, :excoveralls, "0.13.1", "b9f1697f7c9e0cfe15d1a1d737fb169c398803ffcbc57e672aa007e9fd42864c", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "b4bb550e045def1b4d531a37fb766cbbe1307f7628bf8f0414168b3f52021cce"},
+  "excoveralls": {:hex, :excoveralls, "0.13.2", "5ca05099750c086f144fcf75842c363fc15d7d9c6faa7ad323d010294ced685e", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "1e7ed75c158808a5a8f019d3ad63a5efe482994f2f8336c0a8c77d2f0ab152ce"},
   "exgravatar": {:hex, :exgravatar, "2.0.2", "638412896170409da114f98947d3f8d4f38e851b0e329c1cc4cd324d5e2ea081", [:mix], [], "hexpm", "f3deb5baa6fcf354a965d794ee73a956d95f1f79f41bddf69800c713cfb014a1"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},
   "exvcr": {:hex, :exvcr, "0.11.2", "24aec6ad13a659f10591911089c01f8d2691e2fff75710c924b64437cc1b36a1", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:httpoison, "~> 1.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.4", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "0dad8a3065af4040933bc3ec296f28654b04e993a81054199c832fa86329e80f"},
@@ -60,9 +60,9 @@
   "geo": {:hex, :geo, "3.3.5", "f721ba4dcbd9e2d5a0c8d3291e0c393188cfe9a7d747cc0f89e576bbd3281483", [:mix], [], "hexpm", "ae32691140d72454af6613f9a5616ad3823b77a81102552091d771f587d07286"},
   "geo_postgis": {:hex, :geo_postgis, "3.3.1", "45bc96b9121d0647341685dc9d44956d61338707482d655c803500676b0413a1", [:mix], [{:geo, "~> 3.3", [hex: :geo, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm", "3c3957d8750e3effd565f068ee658ef0e881f9a07084a23f6c5ef8262d09b8e9"},
   "geohax": {:hex, :geohax, "0.3.0", "c2e7d8cc6cdf4158120b50fcbe03a296da561d2089eb7ad68d84b6f5d3df5607", [:mix], [], "hexpm", "af9d4f4d5b031fbecac1d404a3077d941de91eea94fd1be8c97fd33c520da6a7"},
-  "geolix": {:hex, :geolix, "1.1.0", "8b0fe847fef486d9e8b7c21eae6cbc2d998fb249e61d3f4f136f8016b9c1c833", [:mix], [{:poolboy, "~> 1.0", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "980854f2aef30c288dc79e86c5267806d704c4525fde1b75de9a92f67fb16300"},
-  "geolix_adapter_mmdb2": {:hex, :geolix_adapter_mmdb2, "0.5.0", "5912723d9538ecddc6b29b1d8041b917b735a78fd3c122bfea8c44aa782e3369", [:mix], [{:geolix, "~> 1.1", [hex: :geolix, repo: "hexpm", optional: false]}, {:mmdb2_decoder, "~> 3.0", [hex: :mmdb2_decoder, repo: "hexpm", optional: false]}], "hexpm", "cb1485b6a0a2d3e541949207428a245718dbf1258453a0df0e5fdd925bcecd3e"},
-  "gettext": {:hex, :gettext, "0.18.1", "89e8499b051c7671fa60782faf24409b5d2306aa71feb43d79648a8bc63d0522", [:mix], [], "hexpm", "e70750c10a5f88cb8dc026fc28fa101529835026dec4a06dba3b614f2a99c7a9"},
+  "geolix": {:hex, :geolix, "2.0.0", "7e65764bedfc98d08a3ddb24c417657c9d438eff163280b45fbb7de289626acd", [:mix], [], "hexpm", "8742bf588ed0bb7def2c443204d09d355990846c6efdff96ded66aac24c301df"},
+  "geolix_adapter_mmdb2": {:hex, :geolix_adapter_mmdb2, "0.6.0", "6ab9dbf6ea395817aa1fd2597be25d0dda1853c7f664e62716e47728d18bc4f9", [:mix], [{:geolix, "~> 2.0", [hex: :geolix, repo: "hexpm", optional: false]}, {:mmdb2_decoder, "~> 3.0", [hex: :mmdb2_decoder, repo: "hexpm", optional: false]}], "hexpm", "06ff962feae8a310cffdf86b74bfcda6e2d0dccb439bb1f62df2b657b1c0269b"},
+  "gettext": {:hex, :gettext, "0.18.2", "7df3ea191bb56c0309c00a783334b288d08a879f53a7014341284635850a6e55", [:mix], [], "hexpm", "f9f537b13d4fdd30f3039d33cb80144c3aa1f8d9698e47d7bcbcc8df93b1f5c5"},
   "git_status": {:hex, :git_status, "0.1.0", "228b5d2e62c60a157314ff7398a92ab9a108005f4e532d4ecb07bc62fdd67e85", [:mix], [], "hexpm", "2393ee163f71ff75d5374bf20ceab6ea200249ed1beee5a4a31a8e599710de19"},
   "guardian": {:hex, :guardian, "2.1.1", "1f02b349f6ba765647cc834036a8d76fa4bd65605342fe3a031df3c99d0d411a", [:mix], [{:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.3 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "189b87ba7ce6b40d6ba029138098b96ffc4ae78f229f5b39539b9141af8bf0f8"},
   "guardian_db": {:hex, :guardian_db, "2.0.3", "18c847efbf7ec3c0dd44c7aecaeeb2777588bbb8d2073ffc36e71037108b3be6", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.1", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:guardian, "~> 1.0 or ~> 2.0", [hex: :guardian, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.13", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "17306e09498bca379fb8eded2ac44d7690f738ca14b17080d06a948d034ea087"},
@@ -83,7 +83,7 @@
   "jose": {:hex, :jose, "1.10.1", "16d8e460dae7203c6d1efa3f277e25b5af8b659febfc2f2eb4bacf87f128b80a", [:mix, :rebar3], [], "hexpm", "3c7ddc8a9394b92891db7c2771da94bf819834a1a4c92e30857b7d582e2f8257"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "jumper": {:hex, :jumper, "1.0.1", "3c00542ef1a83532b72269fab9f0f0c82bf23a35e27d278bfd9ed0865cecabff", [:mix], [], "hexpm", "318c59078ac220e966d27af3646026db9b5a5e6703cb2aa3e26bcfaba65b7433"},
-  "makeup": {:hex, :makeup, "1.0.3", "e339e2f766d12e7260e6672dd4047405963c5ec99661abdc432e6ec67d29ef95", [:mix], [{:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "2e9b4996d11832947731f7608fed7ad2f9443011b3b479ae288011265cdd3dad"},
+  "makeup": {:hex, :makeup, "1.0.4", "6d1936d21585cd258aeadf7728a572ae2a6017a909349a12270c1e460e360f49", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "a45dc0440b9ff1aca4883bedcae1f5939ec3b1f6e28026a15147ed1a45d897cd"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.14.1", "4f0e96847c63c17841d42c08107405a005a2680eb9c7ccadfd757bd31dabccfb", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f2438b1a80eaec9ede832b5c41cd4f373b38fd7aa33e3b22d9db79e640cbde11"},
   "meck": {:hex, :meck, "0.8.13", "ffedb39f99b0b99703b8601c6f17c7f76313ee12de6b646e671e3188401f7866", [:rebar3], [], "hexpm", "d34f013c156db51ad57cc556891b9720e6a1c1df5fe2e15af999c84d6cebeb1a"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
@@ -95,7 +95,7 @@
   "mochiweb": {:hex, :mochiweb, "2.20.1", "e4dbd0ed716f076366ecf62ada5755a844e1d95c781e8c77df1d4114be868cdf", [:rebar3], [], "hexpm", "d1aeee7870470d2fa9eae0b3d5ab6c33801aa2d82b10e9dade885c5c921b36aa"},
   "mock": {:hex, :mock, "0.3.5", "feb81f52b8dcf0a0d65001d2fec459f6b6a8c22562d94a965862f6cc066b5431", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "6fae404799408300f863550392635d8f7e3da6b71abdd5c393faf41b131c8728"},
   "mogrify": {:hex, :mogrify, "0.8.0", "3506f3ca3f7b95a155f3b4ef803b5db176f5a0633723e3fe85e0d6399e3b11c8", [:mix], [], "hexpm", "2278d245f07056ea3b586e98801e933695147066fa4cf563f552c1b4f0ff8ad9"},
-  "mox": {:hex, :mox, "0.5.2", "55a0a5ba9ccc671518d068c8dddd20eeb436909ea79d1799e2209df7eaa98b6c", [:mix], [], "hexpm", "df4310628cd628ee181df93f50ddfd07be3e5ecc30232d3b6aadf30bdfe6092b"},
+  "mox": {:hex, :mox, "1.0.0", "4b3c7005173f47ff30641ba044eb0fe67287743eec9bd9545e37f3002b0a9f8b", [:mix], [], "hexpm", "201b0a20b7abdaaab083e9cf97884950f8a30a1350a1da403b3145e213c6f4df"},
   "nimble_parsec": {:hex, :nimble_parsec, "0.6.0", "32111b3bf39137144abd7ba1cce0914533b2d16ef35e8abc5ec8be6122944263", [:mix], [], "hexpm", "27eac315a94909d4dc68bc07a4a83e06c8379237c5ea528a9acff4ca1c873c52"},
   "nimble_pool": {:hex, :nimble_pool, "0.1.0", "ffa9d5be27eee2b00b0c634eb649aa27f97b39186fec3c493716c2a33e784ec6", [:mix], [], "hexpm", "343a1eaa620ddcf3430a83f39f2af499fe2370390d4f785cd475b4df5acaf3f9"},
   "oauth2": {:hex, :oauth2, "2.0.0", "338382079fe16c514420fa218b0903f8ad2d4bfc0ad0c9f988867dfa246731b0", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "881b8364ac7385f9fddc7949379cbe3f7081da37233a1aa7aab844670a91e7e7"},
@@ -104,8 +104,8 @@
   "ordinal": {:hex, :ordinal, "0.1.0", "2f7a1a64ff4be44b8a674718bb00d1584188fe92fa2fa48b95b1e72096d74a34", [:mix], [], "hexpm", "9f3d0a50c285ac99faa9626376e11afa6fc83d42e95166768b37d176cff485a3"},
   "paddle": {:hex, :paddle, "0.1.4", "3697996d79e3d771d6f7560a23e4bad1ed7b7f7fd3e784f97bc39565963b2b13", [:mix], [], "hexpm", "fc719a9e7c86f319b9f4bf413d6f0f326b0c4930d5bc6630d074598ed38e2143"},
   "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"},
-  "phoenix": {:hex, :phoenix, "1.5.4", "0fca9ce7e960f9498d6315e41fcd0c80bfa6fbeb5fa3255b830c67fdfb7e703f", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4e516d131fde87b568abd62e1b14aa07ba7d5edfd230bab4e25cc9dedbb39135"},
-  "phoenix_ecto": {:hex, :phoenix_ecto, "4.2.0", "4ac3300a22240a37ed54dfe6c0be1b5623304385d1a2c210a70f011d9e7af7ac", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 2.15", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "59e7e2a550d7ea082a665c0fc29485f06f55d1a51dd02f513aafdb9d16fc72c4"},
+  "phoenix": {:hex, :phoenix, "1.5.5", "9a5a197edc1828c5f138a8ef10524dfecc43e36ab435c14578b1e9b4bd98858c", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b10eaf86ad026eafad2ee3dd336f0fb1c95a3711789855d913244e270bde463b"},
+  "phoenix_ecto": {:hex, :phoenix_ecto, "4.2.1", "13f124cf0a3ce0f1948cf24654c7b9f2347169ff75c1123f44674afee6af3b03", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 2.15", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "478a1bae899cac0a6e02be1deec7e2944b7754c04e7d4107fc5a517f877743c0"},
   "phoenix_html": {:hex, :phoenix_html, "2.14.2", "b8a3899a72050f3f48a36430da507dd99caf0ac2d06c77529b1646964f3d563e", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "58061c8dfd25da5df1ea0ca47c972f161beb6c875cd293917045b92ffe1bf617"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.2.4", "940c0344b1d66a2e46eef02af3a70e0c5bb45a4db0bf47917add271b76cd3914", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "38f9308357dea4cc77f247e216da99fcb0224e05ada1469167520bed4cb8cccd"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.0.0", "a1ae76717bb168cdeb10ec9d92d1480fec99e3080f011402c0a2d68d47395ffb", [:mix], [], "hexpm", "c52d948c4f261577b9c6fa804be91884b381a7f8f18450c5045975435350f771"},
@@ -114,7 +114,7 @@
   "plug_crypto": {:hex, :plug_crypto, "1.1.2", "bdd187572cc26dbd95b87136290425f2b580a116d3fb1f564216918c9730d227", [:mix], [], "hexpm", "6b8b608f895b6ffcfad49c37c7883e8df98ae19c6a28113b02aa1e9c5b22d6b5"},
   "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"},
   "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
-  "postgrex": {:hex, :postgrex, "0.15.5", "aec40306a622d459b01bff890fa42f1430dac61593b122754144ad9033a2152f", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ed90c81e1525f65a2ba2279dbcebf030d6d13328daa2f8088b9661eb9143af7f"},
+  "postgrex": {:hex, :postgrex, "0.15.6", "a464c72010a56e3214fe2b99c1a76faab4c2bb0255cabdef30dea763a3569aa2", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "f99268325ac8f66ffd6c4964faab9e70fbf721234ab2ad238c00f9530b8cdd55"},
   "progress_bar": {:hex, :progress_bar, "2.0.0", "447285f533b4b8717881fdb7160c7360c2f2ab57276f8904ce6d40482857e573", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "9d8b879f322fd5563e8e7ec39f1d02a9da3ffc36019f05287788744e88260fde"},
   "ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm", "451d8527787df716d99dc36162fca05934915db0b6141bbdac2ea8d3c7afc7d7"},
   "remote_ip": {:hex, :remote_ip, "0.2.1", "cd27cd8ea54ecaaf3532776ff4c5e353b3804e710302e88c01eadeaaf42e7e24", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:inet_cidr, "~> 1.0", [hex: :inet_cidr, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "2e7ab1a461cc3cd5719f37e116a08f45c8b8493923063631b164315d6b7ee8e0"},

priv/gettext/ar/LC_MESSAGES/default.po

@@ -115,7 +115,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr ""
 
@@ -151,7 +151,7 @@ msgid "Warning"
 msgstr "تنبيه"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -1029,6 +1029,7 @@ msgstr "إعرض التقرير"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1056,7 +1057,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1073,13 +1075,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "لقد قمتَ بتقديم طلب للمشاركة في فعالية %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1285,3 +1288,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "لقد قمتَ بتقديم طلب للمشاركة في فعالية %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr ""

priv/gettext/be/LC_MESSAGES/default.po

@@ -112,7 +112,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr ""
 
@@ -148,7 +148,7 @@ msgid "Warning"
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -1005,6 +1005,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1032,7 +1033,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1049,13 +1051,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1261,3 +1264,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr ""

priv/gettext/ca/LC_MESSAGES/default.po

@@ -122,7 +122,7 @@ msgstr ""
 "'activar-lo. Si no l'has creat tu, ignora aquest mail."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "T'han aprovat la participació a %{title}"
 
@@ -158,7 +158,7 @@ msgid "Warning"
 msgstr "Alerta"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -1022,6 +1022,7 @@ msgstr "Mostra la denúncia"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1049,7 +1050,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1066,13 +1068,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "Has soŀlicitat participar a l'activitat %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1281,3 +1284,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "Has soŀlicitat participar a l'activitat %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "T'han aprovat la participació a %{title}"

priv/gettext/cs/LC_MESSAGES/default.po

@@ -112,7 +112,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr ""
 
@@ -148,7 +148,7 @@ msgid "Warning"
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -1005,6 +1005,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1032,7 +1033,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1049,13 +1051,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1261,3 +1264,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -124,7 +124,7 @@ msgstr ""
 "E-Mail bitte."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "Deine Teilnahme an der Veranstaltung %{title}wurde akzeptiert"
 
@@ -161,7 +161,7 @@ msgid "Warning"
 msgstr "Warnung"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr "Meine Teilnahme an der Veranstaltung %{title} zusagen"
 
@@ -1030,6 +1030,7 @@ msgstr "Meldung ansehen"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1057,7 +1058,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1074,13 +1076,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "Du hast angefragt, an der Veranstaltung %{title} teilzunehmen."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1289,3 +1292,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "Du hast angefragt, an der Veranstaltung %{title} teilzunehmen."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "Deine Teilnahme an der Veranstaltung %{title}wurde akzeptiert"

priv/gettext/default.pot

@@ -98,7 +98,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr ""
 
@@ -134,7 +134,7 @@ msgid "Warning"
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -984,6 +984,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1011,7 +1012,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1028,13 +1030,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1240,3 +1243,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -121,7 +121,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr "You created an account on %{host} with this email address. You are one click away from activating it."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "Your participation to event %{title} has been approved"
 
@@ -157,7 +157,7 @@ msgid "Warning"
 msgstr "Warning"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -1007,6 +1007,7 @@ msgstr "View the report"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1034,7 +1035,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1051,13 +1053,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "You requested to participate in event %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1263,3 +1266,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "You requested to participate in event %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "Your participation to event %{title} has been approved"

priv/gettext/es/LC_MESSAGES/default.po

@@ -123,7 +123,7 @@ msgstr ""
 "Estás a un clic de activarlo. Si no eras tú, ignora este correo electrónico."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "Su participación en el evento %{title} ha sido aprobada"
 
@@ -160,7 +160,7 @@ msgid "Warning"
 msgstr "Advertencia"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr "Confirme su participación en el evento %{title}"
 
@@ -1218,6 +1218,7 @@ msgstr "Ver el informe:"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr "Visita la página del evento"
 
@@ -1245,7 +1246,8 @@ msgstr "Qué pasa hoy?"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 "Si desea actualizar o cancelar su asistencia, simplemente acceda a la página "
@@ -1268,13 +1270,14 @@ msgid "You issued a request to attend %{title}."
 msgstr "Envió una solicitud para asistir a %{title}."
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "Solicitaste participar en el evento %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr "¡Vas!"
 
@@ -1579,3 +1582,20 @@ msgstr ""
 "contenidos se entregan a los servidores. siguiendo tu instancia, y los "
 "mensajes directos se entregan a los servidores de los destinatarios, en la "
 "medida en que estos destinatarios residen en un servidor diferente a este."
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "Solicitaste participar en el evento %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "Su participación en el evento %{title} ha sido aprobada"

priv/gettext/fi/LC_MESSAGES/default.po

@@ -123,7 +123,7 @@ msgstr ""
 "huomiotta."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "Osallistumisesi tapahtumaan %{title} on hyväksytty"
 
@@ -159,7 +159,7 @@ msgid "Warning"
 msgstr "Varoitus"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr "Vahvista osallistumisesi tapahtumaan %{title}"
 
@@ -1196,6 +1196,7 @@ msgstr "Näytä raportti:"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr "Käy tapahtumasivulla"
 
@@ -1223,7 +1224,8 @@ msgstr "Mitä tänään tapahtuu?"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 "Jos haluat päivittää tai perua osallistumisesi, siirry yllä olevasta "
@@ -1246,13 +1248,14 @@ msgid "You issued a request to attend %{title}."
 msgstr "Lähetit pyynnön osallistua tapahtumaan %{title}."
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "Lähetit pyynnön osallistua tapahtumaan %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr "Olet mukana!"
 
@@ -1537,3 +1540,20 @@ msgstr ""
 "palvelimille. Ryhmän kautta luotu sisältö välitetään ryhmän kaikkien "
 "jäsenten kaikille palvelimille, mikäli ryhmässä on muita kuin tätä "
 "palvelinta käyttäviä jäseniä."
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "Lähetit pyynnön osallistua tapahtumaan %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "Osallistumisesi tapahtumaan %{title} on hyväksytty"

priv/gettext/fr/LC_MESSAGES/default.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2020-09-23 15:04+0200\n"
+"PO-Revision-Date: 2020-09-29 17:07+0200\n"
 "Last-Translator: Thomas Citharel <thomas.citharel@framasoft.org>\n"
 "Language-Team: French <https://weblate.framasoft.org/projects/mobilizon/backend/fr/>\n"
 "Language: fr\n"
@@ -120,7 +120,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr "Vous avez créé un compte sur %{host} avec cette adresse email. Vous êtes à un clic de l'activer."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "Votre participation à l'événement %{title} a été approuvée"
 
@@ -156,7 +156,7 @@ msgid "Warning"
 msgstr "Attention"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr "Confirmer ma participation à l'événement %{title}"
 
@@ -1006,6 +1006,7 @@ msgstr "Voir le signalement :"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr "Voir la page de l'événement"
 
@@ -1033,7 +1034,8 @@ msgstr "Quoi de neuf aujourd'hui ?"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr "Si vous souhaitez mettre à jour ou annuler votre participation, il vous suffit d'accéder à la page de l'événement par le lien ci-dessus et de cliquer sur le bouton Participer."
 
@@ -1050,13 +1052,14 @@ msgid "You issued a request to attend %{title}."
 msgstr "Vous avez effectué une demande de participation à %{title}."
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "Vous avez demandé à participer à l'événement %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr "Vous y allez !"
 
@@ -1264,3 +1267,20 @@ msgstr "Vos <b>évènements</b> et <b>commentaires</b> sont transmis aux instanc
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr "Votre contenu peut être téléchargé par d'autres instances du réseau. Vos événements publics et commentaires sont transmis aux instances abonnées à votre instance. Le contenu créé à travers un groupe est transmis à toutes les instances de tous les membres du groupe, si celleux-ci sont inscrit·e·s sur une autre instance que la vôtre."
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr "Vous avez confirmé votre participation. Mettez à jour votre agenda, car vous êtes maintenant sur la liste des invités !"
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "Vous avez demandé à participer à l'événement <b>%{title}</b>."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "Votre participation à l'événement %{title} a été approuvée"

priv/gettext/it/LC_MESSAGES/default.po

@@ -116,7 +116,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr ""
 
@@ -152,7 +152,7 @@ msgid "Warning"
 msgstr "Attenzione"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -1003,6 +1003,7 @@ msgstr "Visualizza la segnalazione:"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr "Visualizza la pagina dell'evento"
 
@@ -1030,7 +1031,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1047,13 +1049,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1259,3 +1262,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr ""

priv/gettext/ja/LC_MESSAGES/default.po

@@ -114,7 +114,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid "Warning"
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -993,6 +993,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1020,7 +1021,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1037,13 +1039,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1249,3 +1252,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr ""

priv/gettext/nl/LC_MESSAGES/default.po

@@ -123,7 +123,7 @@ msgstr ""
 "klik van de activering. Gelieve deze email te negeren als u dit niet was."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "Uw deelname aan het evenement %{title} is goedgekeurd"
 
@@ -159,7 +159,7 @@ msgid "Warning"
 msgstr "Waarschuwing"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -1025,6 +1025,7 @@ msgstr "Bekijk de melding"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1052,7 +1053,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1069,13 +1071,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "U hebt gevraagd om deel te nemen aan het evenement %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1284,3 +1287,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "U hebt gevraagd om deel te nemen aan het evenement %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "Uw deelname aan het evenement %{title} is goedgekeurd"

priv/gettext/oc/LC_MESSAGES/default.po

@@ -115,7 +115,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr "Avètz creat un compte sus %{host} amb aquesta adreça electronica. Sètz a un clic de l’activar."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "Vòstra participacion a l’eveniment %{title} es estada aprovada"
 
@@ -152,7 +152,7 @@ msgid "Warning"
 msgstr "Avertiment"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr "Confirmatz vòstra participacion a l’eveniment %{title}"
 
@@ -1025,6 +1025,7 @@ msgstr "Veire lo senhalament"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1052,7 +1053,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1069,13 +1071,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "Avètz demandat de participar a l’eveniment %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1286,3 +1289,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "Avètz demandat de participar a l’eveniment %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "Vòstra participacion a l’eveniment %{title} es estada aprovada"

priv/gettext/pl/LC_MESSAGES/default.po

@@ -125,7 +125,7 @@ msgstr ""
 "e-mail."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "Twój udział w wydarzeniu %{title} został zatwierdzony"
 
@@ -163,7 +163,7 @@ msgid "Warning"
 msgstr "Ostrzeżenie"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr "Potwierdź swoje uczestnictwo w wydarzeniu %{title}"
 
@@ -1038,6 +1038,7 @@ msgstr "Zobacz zgłoszenie"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1065,7 +1066,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1082,13 +1084,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "Poprosiłeś(-aś) o uczestnictwo w wydarzeniu %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1297,3 +1300,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "Poprosiłeś(-aś) o uczestnictwo w wydarzeniu %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "Twój udział w wydarzeniu %{title} został zatwierdzony"

priv/gettext/pt/LC_MESSAGES/default.po

@@ -112,7 +112,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr ""
 
@@ -148,7 +148,7 @@ msgid "Warning"
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -998,6 +998,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1025,7 +1026,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1042,13 +1044,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1254,3 +1257,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr ""

priv/gettext/pt_BR/LC_MESSAGES/default.po

@@ -123,7 +123,7 @@ msgstr ""
 "ignorar este e-mail."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "A sua participação no evento %{title} foi aprovada"
 
@@ -159,7 +159,7 @@ msgid "Warning"
 msgstr "Atenção"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr "Confirmar sua participação no evento %{title}"
 
@@ -1082,6 +1082,7 @@ msgstr "Veja o relato"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1109,7 +1110,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1126,13 +1128,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "Você solicitou participar no evento %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1376,3 +1379,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "Você solicitou participar no evento %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "A sua participação no evento %{title} foi aprovada"

priv/gettext/ru/LC_MESSAGES/default.po

@@ -119,7 +119,7 @@ msgid "You created an account on %{host} with this email address. You are one cl
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr ""
 
@@ -155,7 +155,7 @@ msgid "Warning"
 msgstr ""
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -1016,6 +1016,7 @@ msgstr "Показать сообщение о проблеме"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1043,7 +1044,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1060,13 +1062,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1272,3 +1275,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr ""

priv/gettext/sv/LC_MESSAGES/default.po

@@ -124,7 +124,7 @@ msgstr ""
 "du strunta i det här meddelandet."
 
 #, elixir-format
-#: lib/web/email/participation.ex:92
+#: lib/web/email/participation.ex:113
 msgid "Your participation to event %{title} has been approved"
 msgstr "Din förfrågan om att få delta i evenemanget %{title} har godkännts"
 
@@ -161,7 +161,7 @@ msgid "Warning"
 msgstr "Varning"
 
 #, elixir-format
-#: lib/web/email/participation.ex:114
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr ""
 
@@ -1021,6 +1021,7 @@ msgstr "Visa anmälan:"
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
+#: lib/web/templates/email/event_participation_confirmed.html.eex:58
 msgid "Visit event page"
 msgstr ""
 
@@ -1048,7 +1049,8 @@ msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
-#: lib/web/templates/email/event_participation_approved.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
+#: lib/web/templates/email/event_participation_confirmed.text.eex:6
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
@@ -1065,13 +1067,14 @@ msgid "You issued a request to attend %{title}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_approved.text.eex:5
+#: lib/web/templates/email/event_participation_confirmed.text.eex:3
 msgid "You recently requested to attend %{title}."
 msgstr "Du har bett om att få delta i evenemanget %{title}."
 
 #, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
+#: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
 msgid "You're going!"
 msgstr ""
 
@@ -1277,3 +1280,20 @@ msgstr ""
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
+msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:38
+#: lib/web/templates/email/event_participation_confirmed.html.eex:38
+msgid "You recently requested to attend <b>%{title}</b>."
+msgstr "Du har bett om att få delta i evenemanget %{title}."
+
+#, elixir-format
+#: lib/web/email/participation.ex:92
+msgid "Your participation to event %{title} has been confirmed"
+msgstr "Din förfrågan om att få delta i evenemanget %{title} har godkännts"

test/graphql/resolvers/participant_test.exs

@@ -1139,14 +1139,20 @@ defmodule Mobilizon.GraphQL.Resolvers.ParticipantTest do
         Email.Participation.anonymous_participation_confirmation(@email, participant)
       )
 
-      conn
-      |> AbsintheHelpers.graphql_query(
-        query: @confirmation_mutation,
-        variables: %{confirmationToken: confirmation_token}
-      )
+      res =
+        conn
+        |> AbsintheHelpers.graphql_query(
+          query: @confirmation_mutation,
+          variables: %{confirmationToken: confirmation_token}
+        )
+
+      assert is_nil(res["errors"])
 
       assert %Participant{role: :participant} =
+               participant =
                event.id |> Events.list_participants_for_event() |> Map.get(:elements) |> hd()
+
+      assert_delivered_email(Email.Participation.participation_updated(@email, participant))
     end
 
     test "I can participate anonymously and and confirm my participation with bad token",