Unverified Commit e5ba9a1a authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Move translations to registrations.closed 

And remove unused translations and make "another pod" translatable.

closes #7896
parent 4feab521

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -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

app/views/registrations/_registrations_closed.haml

+4 −4
Original line number Diff line number Diff line 
%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"))

config/locales/diaspora/en.yml

+5 −5
Original line number Diff line number Diff line
@@ -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: