Merge pull request #1443 from meetfranz/feature/multilingual-announce…

…ments support multilingual announcements
meetfranz · May 23, 2019 · 1b167e0 · 1b167e0
2 parents 4ea7765 + 7e9a50a
commit 1b167e0
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
@@ -29,7 +29,15 @@ export class AnnouncementsStore extends FeatureStore {
   }
 
   @computed get announcement() {
-    return getAnnouncementRequest.result;
+    if (!this.stores || !getAnnouncementRequest.result) return null;
+    const { locale, defaultLocale } = this.stores.app;
+    const announcement = getAnnouncementRequest.result;
+    // User locale
+    if (announcement[locale]) return announcement[locale];
+    // Default locale
+    if (announcement[defaultLocale]) return announcement[defaultLocale];
+    // No locales specified
+    return announcement;
   }
 
   @computed get areNewsAvailable() {
@@ -121,8 +129,8 @@ export class AnnouncementsStore extends FeatureStore {
   _fetchAnnouncements = () => {
     const targetVersion = this.targetVersion || this.currentVersion;
     if (!targetVersion) return;
-    getChangelogRequest.execute(targetVersion);
-    getAnnouncementRequest.execute(targetVersion);
+    getChangelogRequest.reset().execute(targetVersion);
+    getAnnouncementRequest.reset().execute(targetVersion);
   };
 
   _showAnnouncementOnRouteMatch = () => {