diff --git a/app/views/shared/_landing_strip.html.haml b/app/views/shared/_landing_strip.html.haml index 3cc61a2c39..35461a8cb7 100644 --- a/app/views/shared/_landing_strip.html.haml +++ b/app/views/shared/_landing_strip.html.haml @@ -1,6 +1,5 @@ .landing-strip - = t('landing_strip_html', - name: content_tag(:span, display_name(account), class: :emojify), - link_to_root_path: link_to(content_tag(:strong, site_hostname), root_path)) + = t('landing_strip_html', name: content_tag(:span, display_name(account), class: :emojify), link_to_root_path: link_to(content_tag(:strong, site_hostname), root_path)) + - if open_registrations? = t('landing_strip_signup_html', sign_up_path: new_user_registration_path) diff --git a/config/locales/ar.yml b/config/locales/ar.yml index b80e928e6c..4d045dee1e 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -93,7 +93,7 @@ ar: blocking: قائمة المحظورين following: قائمة المستخدمين المتبوعين upload: تحميل - landing_strip_html: %{name} is a user on %{domain}. You can follow them or interact with them if you have an account anywhere in the fediverse.. + landing_strip_html: %{name} is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse.. landing_strip_signup_html: If you don't, you can sign up here. media_attachments: validations: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 83c6d1c2a3..f7a0fd65ae 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -256,7 +256,8 @@ ca: following: Llista de seguits muting: Llista d'apagats upload: Carregar - landing_strip_html: %{name} és un usuari/a de %{domain}. Pots seguir-lo/la o interactuar amb ell/a si tens un compte a qualsevol node del fediverse. Si no en tens, pots registrar-te aquí. + landing_strip_html: %{name} és un usuari/a de %{link_to_root_path}. Pots seguir-lo/la o interactuar amb ell/a si tens un compte a qualsevol node del fediverse. + landing_strip_signup_html: Si no en tens, pots registrar-te aquí. media_attachments: validations: images_and_video: No es pot adjuntar un vídeo a un estat que ja contingui imatges @@ -300,7 +301,7 @@ ca: back: Tornar al inici edit_profile: Editar perfil export: Exportar informació - followers: Seguidors autoritzats + followers: Seguidors autoritzats import: Importar preferences: Preferències settings: Configuració diff --git a/config/locales/de.yml b/config/locales/de.yml index 20adaf59af..a7d86e2849 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -229,7 +229,7 @@ de: following: Folgeliste muting: Stummschaltungsliste upload: Hochladen - landing_strip_html: %{name} ist ein Benutzer auf %{domain}. Du kannst ihm folgen oder mit ihm interagieren, sofern du ein Konto irgendwo im Fediverse hast. + landing_strip_html: %{name} ist ein Benutzer auf %{link_to_root_path}. Du kannst ihm folgen oder mit ihm interagieren, sofern du ein Konto irgendwo in der Fediverse hast. landing_strip_signup_html: Wenn nicht, kannst du dich hier anmelden. media_attachments: validations: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 5df9999f4a..c57973da2a 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -255,7 +255,7 @@ fa: following: فهرست پی‌گیری‌ها muting: فهرست بی‌صداشده‌ها upload: بارگذاری - landing_strip_html: %{name} کاربری روی %{domain} است. شما با داشتن حساب روی هر سروری می‌توانید نوشته‌های او را پیگیری کرده یا با او ارتباط داشته باشید. + landing_strip_html: %{name} کاربری روی %{link_to_root_path} است. شما با داشتن حساب روی هر سروری می‌توانید نوشته‌های او را پیگیری کرده یا با او ارتباط داشته باشید. landing_strip_signup_html: اگر هنوز حسابی ندارید این‌جا حساب باز کنید. media_attachments: validations: @@ -314,7 +314,7 @@ fa: private_long: نمایش تنها به پیگیران public: عمومی public_long: همه می‌توانند ببینند - unlisted: فهرست‌نشده + unlisted: فهرست‌نشده unlisted_long: عمومی، ولی در فهرست نوشته‌ها نمایش نمی‌یابد stream_entries: click_to_show: برای نمایش کلیک کنید diff --git a/yarn.lock b/yarn.lock index 069324e2a7..549c7178a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2586,38 +2586,7 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" -express@^4.13.3, express@^4.14.1: - version "4.14.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.14.1.tgz#646c237f766f148c2120aff073817b9e4d7e0d33" - dependencies: - accepts "~1.3.3" - array-flatten "1.1.1" - content-disposition "0.5.2" - content-type "~1.0.2" - cookie "0.3.1" - cookie-signature "1.0.6" - debug "~2.2.0" - depd "~1.1.0" - encodeurl "~1.0.1" - escape-html "~1.0.3" - etag "~1.7.0" - finalhandler "0.5.1" - fresh "0.3.0" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.1" - path-to-regexp "0.1.7" - proxy-addr "~1.1.3" - qs "6.2.0" - range-parser "~1.2.0" - send "0.14.2" - serve-static "~1.11.2" - type-is "~1.6.14" - utils-merge "1.0.0" - vary "~1.1.0" - -express@^4.15.2: +express@^4.13.3, express@^4.15.2: version "4.15.3" resolved "https://registry.yarnpkg.com/express/-/express-4.15.3.tgz#bab65d0f03aa80c358408972fc700f916944b662" dependencies: @@ -2650,6 +2619,37 @@ express@^4.15.2: utils-merge "1.0.0" vary "~1.1.1" +express@^4.14.1: + version "4.14.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.14.1.tgz#646c237f766f148c2120aff073817b9e4d7e0d33" + dependencies: + accepts "~1.3.3" + array-flatten "1.1.1" + content-disposition "0.5.2" + content-type "~1.0.2" + cookie "0.3.1" + cookie-signature "1.0.6" + debug "~2.2.0" + depd "~1.1.0" + encodeurl "~1.0.1" + escape-html "~1.0.3" + etag "~1.7.0" + finalhandler "0.5.1" + fresh "0.3.0" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.1" + path-to-regexp "0.1.7" + proxy-addr "~1.1.3" + qs "6.2.0" + range-parser "~1.2.0" + send "0.14.2" + serve-static "~1.11.2" + type-is "~1.6.14" + utils-merge "1.0.0" + vary "~1.1.0" + extend@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4" @@ -5304,11 +5304,11 @@ qs@6.2.0, qs@^6.1.0: version "6.2.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b" -qs@6.4.0: +qs@6.4.0, qs@^6.2.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" -qs@^6.2.0, qs@~6.3.0: +qs@~6.3.0: version "6.3.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.1.tgz#918c0b3bcd36679772baf135b1acb4c1651ed79d" @@ -5886,15 +5886,15 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@~2.5.0, rimraf@~2.5.1: - version "2.5.4" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" +rimraf@2, rimraf@^2.2.8, rimraf@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: glob "^7.0.5" -rimraf@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" +rimraf@~2.5.0, rimraf@~2.5.1: + version "2.5.4" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: glob "^7.0.5"