From 245be52ac8d9e41998da10cf2d1a752bbefc0c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 12 Apr 2021 15:52:15 +0200
Subject: [PATCH] Translate order by

- Cleanup the store.
- Fix tests.
---
 .../components/FilterMenu/DateSortFilter.vue  | 16 +++--------
 webapp/components/FilterMenu/FilterMenu.vue   |  2 +-
 webapp/locales/de.json                        | 27 +++++++++----------
 webapp/locales/en.json                        | 27 +++++++++----------
 webapp/locales/es.json                        | 26 +++++++++---------
 webapp/locales/fr.json                        | 26 +++++++++---------
 webapp/locales/it.json                        | 24 ++++++++---------
 webapp/locales/pt.json                        | 26 +++++++++---------
 webapp/locales/ru.json                        | 26 +++++++++---------
 webapp/pages/index.spec.js                    |  4 +--
 webapp/store/posts.js                         | 18 ++++++-------
 11 files changed, 101 insertions(+), 121 deletions(-)

diff --git a/webapp/components/FilterMenu/DateSortFilter.vue b/webapp/components/FilterMenu/DateSortFilter.vue
index f43fc99cc..2bba02ec9 100644
--- a/webapp/components/FilterMenu/DateSortFilter.vue
+++ b/webapp/components/FilterMenu/DateSortFilter.vue
@@ -1,29 +1,21 @@
 <template>
   <filter-menu-section :divider="false" class="date-sort-filter">
     <template #filter-list>
-      <!-- Wolle 👇🏼 translations & click
-      <labeled-button
-        icon="user-plus"
-        :label="$t('filter-menu.following')"
-        :filled="filteredByUsersFollowed"
-        :title="$t('contribution.filterFollow')"
-        @click="toggleFilteredByFollowed(currentUser.id)"
-      /> -->
       <li class="item">
         <labeled-button
           icon="sort-amount-asc"
-          :label="'Newest first'"
+          :label="$t('filter-menu.order.newest.label')"
           :filled="orderBy === 'createdAt_desc'"
-          :title="'Sort posts by the newest first'"
+          :title="$t('filter-menu.order.newest.hint')"
           @click="toggleOrder('createdAt_desc')"
         />
       </li>
       <li class="item">
         <labeled-button
           icon="sort-amount-desc"
-          :label="'Oldest first'"
+          :label="$t('filter-menu.order.oldest.label')"
           :filled="orderBy === 'createdAt_asc'"
-          :title="'Sort posts by the oldest first'"
+          :title="$t('filter-menu.order.oldest.hint')"
           @click="toggleOrder('createdAt_asc')"
         />
       </li>
diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue
index bc7804343..d65815346 100644
--- a/webapp/components/FilterMenu/FilterMenu.vue
+++ b/webapp/components/FilterMenu/FilterMenu.vue
@@ -16,7 +16,7 @@
         <following-filter />
       </div>
       <div class="filter-menu-options">
-        <h2 class="title">{{ 'Sorted by …' }}</h2> <!-- Wolle -->
+        <h2 class="title">{{ $t('filter-menu.order-by') }}</h2> <!-- Wolle -->
         <date-sort-filter />
       </div>
     </template>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6ef427362..73d2feda5 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -333,9 +333,20 @@
     "all": "Alle",
     "categories": "Themenkategorien",
     "emotions": "Emotionen",
-    "filter-by": "Filtern nach...",
+    "filter-by": "Filtern nach ...",
     "following": "Benutzern, denen ich folge",
-    "languages": "Sprachen"
+    "languages": "Sprachen",
+    "order": {
+      "newest": {
+        "hint": "Sortiere die Neuesten nach vorn",
+        "label": "Neueste zuerst"
+      },
+      "oldest": {
+        "hint": "Sortiere die Ältesten nach vorn",
+        "label": "Älteste zuerst"
+      }
+    },
+    "order-by": "Sortieren nach ..."
   },
   "followButton": {
     "follow": "Folgen",
@@ -779,18 +790,6 @@
     "thanks": "Danke!",
     "tribunal": "Registergericht"
   },
-  "store": {
-    "posts": {
-      "orderBy": {
-        "newest": {
-          "label": "Neueste"
-        },
-        "oldest": {
-          "label": "Älteste"
-        }
-      }
-    }
-  },
   "termsAndConditions": {
     "newTermsAndConditions": "Neue Nutzungsbedingungen",
     "termsAndConditionsNewConfirm": "Ich habe die neuen Nutzungsbedingungen durchgelesen und stimme zu.",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index c5ad5c27f..476d1db65 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -333,9 +333,20 @@
     "all": "All",
     "categories": "Categories of Content",
     "emotions": "Emotions",
-    "filter-by": "Filter by...",
+    "filter-by": "Filter by ...",
     "following": "Users I follow",
-    "languages": "Languages"
+    "languages": "Languages",
+    "order": {
+      "newest": {
+        "hint": "Sort posts by the newest first",
+        "label": "Newest first"
+      },
+      "oldest": {
+        "hint": "Sort posts by the oldest first",
+        "label": "Oldest first"
+      }
+    },
+    "order-by": "Order by ..."
   },
   "followButton": {
     "follow": "Follow",
@@ -779,18 +790,6 @@
     "thanks": "Thanks!",
     "tribunal": "Registry court"
   },
-  "store": {
-    "posts": {
-      "orderBy": {
-        "newest": {
-          "label": "Newest"
-        },
-        "oldest": {
-          "label": "Oldest"
-        }
-      }
-    }
-  },
   "termsAndConditions": {
     "newTermsAndConditions": "New Terms and Conditions",
     "termsAndConditionsNewConfirm": "I have read and agree to the new terms of conditions.",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 97f1f247b..651d35365 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -280,9 +280,19 @@
     "all": "Todas",
     "categories": "Categorías de contenido",
     "emotions": "Emociones",
-    "filter-by": "Filtrar por...",
+    "filter-by": "Filtrar por ...",
     "following": "Usuarios que sigo",
-    "languages": "Idiomas"
+    "languages": "Idiomas",
+    "order": {
+      "newest": {
+        "hint": null,
+        "label": "Más reciente"
+      },
+      "oldest": {
+        "hint": null,
+        "label": "Más antiguo"
+      }
+    }
   },
   "followButton": {
     "follow": "Seguir",
@@ -702,18 +712,6 @@
     "thanks": "¡Gracias!",
     "tribunal": "Tribunal de registro"
   },
-  "store": {
-    "posts": {
-      "orderBy": {
-        "newest": {
-          "label": "Más reciente"
-        },
-        "oldest": {
-          "label": "Más antiguo"
-        }
-      }
-    }
-  },
   "termsAndConditions": {
     "newTermsAndConditions": "Nuevos términos de uso",
     "termsAndConditionsNewConfirm": "He leído y acepto los nuevos términos de uso.",
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index fe4cf4b9b..803dce549 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -269,9 +269,19 @@
     "all": "Toutes",
     "categories": "Catégories de contenu",
     "emotions": "Émotions",
-    "filter-by": "Filtrer par...",
+    "filter-by": "Filtrer par ...",
     "following": "Utilisateurs que je suis",
-    "languages": "Langues"
+    "languages": "Langues",
+    "order": {
+      "newest": {
+        "hint": null,
+        "label": "Plus récent"
+      },
+      "oldest": {
+        "hint": null,
+        "label": "Le plus ancien"
+      }
+    }
   },
   "followButton": {
     "follow": "Suivre",
@@ -670,18 +680,6 @@
     "thanks": "Merci!",
     "tribunal": "Tribunal de registre"
   },
-  "store": {
-    "posts": {
-      "orderBy": {
-        "newest": {
-          "label": "Plus récent"
-        },
-        "oldest": {
-          "label": "Le plus ancien"
-        }
-      }
-    }
-  },
   "termsAndConditions": {
     "newTermsAndConditions": "Nouvelles conditions générales",
     "termsAndConditionsNewConfirm": "J'ai lu et accepté les nouvelles conditions générales.",
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 0832da2cc..b20ff248b 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -279,7 +279,17 @@
     "emotions": null,
     "filter-by": null,
     "following": null,
-    "languages": null
+    "languages": null,
+    "order": {
+      "newest": {
+        "hint": null,
+        "label": null
+      },
+      "oldest": {
+        "hint": null,
+        "label": null
+      }
+    }
   },
   "followButton": {
     "follow": null,
@@ -620,18 +630,6 @@
     "thanks": null,
     "tribunal": "registro tribunale"
   },
-  "store": {
-    "posts": {
-      "orderBy": {
-        "newest": {
-          "label": null
-        },
-        "oldest": {
-          "label": null
-        }
-      }
-    }
-  },
   "termsAndConditions": {
     "newTermsAndConditions": "Nuovi Termini e Condizioni",
     "termsAndConditionsNewConfirm": "Ho letto e accetto le nuove condizioni generali di contratto.",
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 5f8101c66..2b9d2cd80 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -315,9 +315,19 @@
     "all": "Todos",
     "categories": "Categorias de Conteúdo",
     "emotions": "Emoções",
-    "filter-by": "Filtrar por...",
+    "filter-by": "Filtrar por ...",
     "following": "Usuários que eu sigo",
-    "languages": "Idiomas"
+    "languages": "Idiomas",
+    "order": {
+      "newest": {
+        "hint": null,
+        "label": "Mais recentes"
+      },
+      "oldest": {
+        "hint": null,
+        "label": "Mais antigos"
+      }
+    }
   },
   "followButton": {
     "follow": "Seguir",
@@ -655,18 +665,6 @@
     "thanks": "Obrigado(a)!",
     "tribunal": "tribunal de registo"
   },
-  "store": {
-    "posts": {
-      "orderBy": {
-        "newest": {
-          "label": "Mais recentes"
-        },
-        "oldest": {
-          "label": "Mais antigos"
-        }
-      }
-    }
-  },
   "termsAndConditions": {
     "newTermsAndConditions": "Novos Termos e Condições",
     "termsAndConditionsNewConfirm": "Eu li e concordo com os novos termos de condições.",
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index 95d26690d..be33ad938 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -280,9 +280,19 @@
     "all": "Все",
     "categories": "Категории",
     "emotions": "",
-    "filter-by": "Другие фильтры",
+    "filter-by": "Другие фильтры ...",
     "following": "Мои подписки",
-    "languages": "Языки"
+    "languages": "Языки",
+    "order": {
+      "newest": {
+        "hint": null,
+        "label": "Сначала новые"
+      },
+      "oldest": {
+        "hint": null,
+        "label": "Сначала старые"
+      }
+    }
   },
   "followButton": {
     "follow": "Подписаться",
@@ -702,18 +712,6 @@
     "thanks": "Спасибо!",
     "tribunal": "Суд регистрации"
   },
-  "store": {
-    "posts": {
-      "orderBy": {
-        "newest": {
-          "label": "Сначала новые"
-        },
-        "oldest": {
-          "label": "Сначала старые"
-        }
-      }
-    }
-  },
   "termsAndConditions": {
     "newTermsAndConditions": "Новые условия и положения",
     "termsAndConditionsNewConfirm": "Я прочитал(а) и согласен(на) с новыми условиями.",
diff --git a/webapp/pages/index.spec.js b/webapp/pages/index.spec.js
index 644efa868..79deb3b80 100644
--- a/webapp/pages/index.spec.js
+++ b/webapp/pages/index.spec.js
@@ -39,8 +39,8 @@ describe('PostIndex', () => {
         //     value: 'createdAt_desc',
         //   },
         // ],
-        'posts/selectedOrder': () => () => 'createdAt_desc',
-        'posts/orderIcon': () => 'sort-amount-desc',
+        // 'posts/selectedOrder': () => () => 'createdAt_desc',
+        // 'posts/orderIcon': () => 'sort-amount-desc',
         'posts/orderBy': () => 'createdAt_desc',
         'auth/user': () => {
           return { id: 'u23' }
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 39a1567b4..b9efe1870 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -109,17 +109,17 @@ export const getters = {
   //       label: $t(option.key),
   //     }
   //   }),
-  selectedOrder: (state) => ({ $t }) => {
-    return {
-      ...state.order,
-      label: $t(state.order.key),
-    }
-  },
+  // Wolle selectedOrder: (state) => ({ $t }) => {
+  //   return {
+  //     ...state.order,
+  //     label: $t(state.order.key),
+  //   }
+  // },
   orderBy(state) {
     // return state.order.value
     return state.order
   },
-  orderIcon(state) {
-    return state.order.icon
-  },
+  // Wolle orderIcon(state) {
+  //   return state.order.icon
+  // },
 }