From e5ba9a1a4696f30ba4e6e51893dbdd5c1c0cccca Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 11 May 2019 22:53:57 +0200 Subject: [PATCH] Move translations to registrations.closed And remove unused translations and make "another pod" translatable. closes #7896 --- Changelog.md | 1 + app/views/registrations/_registrations_closed.haml | 8 ++++---- config/locales/diaspora/en.yml | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Changelog.md b/Changelog.md index b0818162a..904b9b895 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ ## Features * Add line mentioning diaspora\* on the splash page [#7966](https://github.com/diaspora/diaspora/pull/7966) +* Improve communication about signing up on closed pods [#7896](https://github.com/diaspora/diaspora/pull/7896) # 0.7.11.0 diff --git a/app/views/registrations/_registrations_closed.haml b/app/views/registrations/_registrations_closed.haml index f3822cc51..c1b9b3a8f 100644 --- a/app/views/registrations/_registrations_closed.haml +++ b/app/views/registrations/_registrations_closed.haml @@ -1,11 +1,11 @@ %h2 = t("devise.shared.links.sign_up_closed") -!= t("help.closed_pod", - wiki: link_to("another pod", "https://diasporafoundation.org/getting_started/sign_up")) +!= t("registrations.closed.closed_pod", + wiki: link_to(t("registrations.closed.another_pod"), "https://diasporafoundation.org/getting_started/sign_up")) -!= t("help.find_pods", +!= t("registrations.closed.find_pods", poduptime: link_to("Poduptime", "https://podupti.me/")) -!= t("help.other_questions", +!= t("registrations.closed.other_questions", wiki: link_to("Wiki", "https://wiki.diasporafoundation.org/Choosing_a_pod")) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 9331f797d..fa3aa016f 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -346,10 +346,6 @@ en: tutorials: "tutorials" tutorial: "tutorial" irc: "IRC" - closed_pod: "This pod is currently closed to new registrations. However, you can still join the diaspora* network by registering on %{wiki}. Because all pods are interconnected, you will have access to the same content there." - find_pods: "There’s a list of pods you can sign up to at %{poduptime}." - other_questions: "If you have any other questions regarding choosing a pod, check out our %{wiki}." - choose_another: "Please, choose another pod" wiki: "wiki" faq: "FAQ" markdown: "Markdown" @@ -1056,7 +1052,11 @@ en: terms_link: "terms of service" create: success: "You’ve joined diaspora*!" - closed: "Signups are closed on this diaspora* pod." + closed: + closed_pod: "This pod is currently closed to new registrations. However, you can still join the diaspora* network by registering on %{wiki}. Because all pods are interconnected, you will have access to the same content there." + another_pod: "another pod" + find_pods: "There’s a list of pods you can sign up to at %{poduptime}." + other_questions: "If you have any other questions regarding choosing a pod, check out our %{wiki}." invalid_invite: "The invite link you provided is no longer valid!" reshares: