Merge pull request #2078 from CSCfi/missing-translation

fix: localization of already-member error
CSCfi · Mar 24, 2020 · 6ea90b6 · 6ea90b6
2 parents c25aee2 + 6af437d
commit 6ea90b6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/resources/translations/en.edn b/resources/translations/en.edn
@@ -16,7 +16,8 @@
             :close-intro [:div.intro [:p "Note that if the application is closed, it cannot be opened again."]]
             :comment "Comment"
             :decide "Decide"
-            :errors {:disabled-catalogue-item "Resource no longer available."
+            :errors {:already-member "User is already a member of this application"
+                     :disabled-catalogue-item "Resource no longer available."
                      :invalid-token [:div [:p "Joining the application failed."] [:p "Check the invitation token " [:code "%1"]]]
                      :licenses-not-accepted "Terms of use not accepted."
                      :submission-failed "Submission failed. Check the following errors:"}

diff --git a/resources/translations/fi.edn b/resources/translations/fi.edn
@@ -16,7 +16,8 @@
             :close-intro [:div.intro [:p "Huomaa, että jos hakemus suljetaan, sitä ei voida avata uudelleen."]]
             :comment "Kommentti"
             :decide "Päätä"
-            :errors {:disabled-catalogue-item "Resurssit eivät ole enää saatavilla."
+            :errors {:already-member "Käyttäjä on jo tämän hakemuksen jäsen"
+                     :disabled-catalogue-item "Resurssit eivät ole enää saatavilla."
                      :invalid-token [:div [:p "Hakemukseen liittyminen epäonnistui."] [:p "Tarkista kutsukoodi " [:code "%1"]]]
                      :licenses-not-accepted "Käyttöehtoja ei ole hyväksytty."
                      :submission-failed "Lähettäminen epäonnistui. Tarkasta seuraavat virheet:"}

diff --git a/src/clj/rems/application/commands.clj b/src/clj/rems/application/commands.clj
@@ -254,7 +254,7 @@
 
 (defn already-member-error [application userid]
   (when (member? userid application)
-    {:errors [{:type :already-member :application-id (:application/id application)}]}))
+    {:errors [{:type :t.actions.errors/already-member :userid userid :application-id (:application/id application)}]}))
 
 (defn- ok-with-data [data events]
   (assoc data :events events))

diff --git a/test/clj/rems/application/test_commands.clj b/test/clj/rems/application/test_commands.clj
@@ -1050,7 +1050,7 @@
                                         :event/actor applicant-user-id
                                         :application/id app-id
                                         :application/member {:userid "somebody"}}])]
-        (is (= {:errors [{:type :already-member :application-id app-id}]}
+        (is (= {:errors [{:type :t.actions.errors/already-member :userid "somebody" :application-id app-id}]}
                (fail-command application
                              {:type :application.command/accept-invitation
                               :actor "somebody"