nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move translations to registrations.closed

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

closes #7896
This commit is contained in:
Benjamin Neff 2019-05-11 22:53:57 +02:00
parent 4feab5219e
commit e5ba9a1a46
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -6,6 +6,7 @@
## Features ## Features
* Add line mentioning diaspora\* on the splash page [#7966](https://github.com/diaspora/diaspora/pull/7966) * 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 # 0.7.11.0

8
app/views/registrations/_registrations_closed.haml
View file

@ -1,11 +1,11 @@
%h2 %h2
= t("devise.shared.links.sign_up_closed") = t("devise.shared.links.sign_up_closed")
!= t("help.closed_pod", != t("registrations.closed.closed_pod",
wiki: link_to("another pod", "https://diasporafoundation.org/getting_started/sign_up")) 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/")) 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")) wiki: link_to("Wiki", "https://wiki.diasporafoundation.org/Choosing_a_pod"))

10
config/locales/diaspora/en.yml
View file

@ -346,10 +346,6 @@ en:
tutorials: "tutorials" tutorials: "tutorials"
tutorial: "tutorial" tutorial: "tutorial"
irc: "IRC" 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" wiki: "wiki"
faq: "FAQ" faq: "FAQ"
markdown: "Markdown" markdown: "Markdown"
@ -1056,7 +1052,11 @@ en:
terms_link: "terms of service" terms_link: "terms of service"
create: create:
success: "You’ve joined diaspora*!" 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!" invalid_invite: "The invite link you provided is no longer valid!"
reshares: reshares: