From fa0be3f834b54bb276eb5233195181fa3760710f Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Mon, 16 Oct 2017 00:36:15 -0700 Subject: Add option to reduce motion (#5393) * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml --- config/locales/simple_form.en.yml | 1 + config/settings.yml | 1 + 2 files changed, 2 insertions(+) (limited to 'config') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 86c80290c..5a58e8667 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -39,6 +39,7 @@ en: otp_attempt: Two-factor code password: Password setting_auto_play_gif: Auto-play animated GIFs + setting_reduce_motion: Reduce motion in animations setting_boost_modal: Show confirmation dialog before boosting setting_default_privacy: Post privacy setting_default_sensitive: Always mark media as sensitive diff --git a/config/settings.yml b/config/settings.yml index c437b4ccb..11681d7ec 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -22,6 +22,7 @@ defaults: &defaults boost_modal: false delete_modal: true auto_play_gif: false + reduce_motion: false system_font_ui: false noindex: false theme: 'default' -- cgit From 1e7b3bf6257dc7fd12c5bafffb941f84bce4b982 Mon Sep 17 00:00:00 2001 From: JeanGauthier <32121978+JeanGauthier@users.noreply.github.com> Date: Mon, 16 Oct 2017 14:09:26 +0200 Subject: i18n ultim hour «More» dropdown title + reduce motion (#5415) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393) --- app/javascript/mastodon/locales/ca.json | 1 + app/javascript/mastodon/locales/es.json | 1 + app/javascript/mastodon/locales/oc.json | 1 + config/locales/oc.yml | 4 ++-- config/locales/simple_form.oc.yml | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index fe2433591..1130e6c09 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -184,6 +184,7 @@ "status.load_more": "Carrega més", "status.media_hidden": "Multimèdia amagat", "status.mention": "Esmentar @{name}", + "status.more": "Més", "status.mute_conversation": "Silenciar conversació", "status.open": "Ampliar aquest estat", "status.pin": "Fixat en el perfil", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index f6bfbb04d..03dd9ce02 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -179,6 +179,7 @@ "status.load_more": "Cargar más", "status.media_hidden": "Contenido multimedia oculto", "status.mention": "Mencionar", + "status.more": "Más", "status.mute_conversation": "Silenciar conversación", "status.open": "Expandir estado", "status.pin": "Fijar", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 4715f60ef..773f2d1e4 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -179,6 +179,7 @@ "status.load_more": "Cargar mai", "status.media_hidden": "Mèdia rescondut", "status.mention": "Mencionar", + "status.more": "Mai", "status.mute_conversation": "Rescondre la conversacion", "status.open": "Desplegar aqueste estatut", "status.pin": "Penjar al perfil", diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 2d72d247f..b30f797c7 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -120,9 +120,9 @@ oc: destroyed_msg: Nòta de moderacion ben suprimida ! custom_emojis: - copied_msg: Còpia locale de l’emoji ben creada + copied_msg: Còpia locala de l’emoji ben creada copy: Copiar - copy_failed_msg: Fracàs de la còpia locale de l’emoji + copy_failed_msg: Fracàs de la còpia locala de l’emoji created_msg: Emoji ben creat ! delete: Suprimir destroyed_msg: Emojo ben suprimit ! diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index d45f98e66..c1d5e2008 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -38,6 +38,7 @@ oc: otp_attempt: Còdi Two-factor password: Senhal setting_auto_play_gif: Lectura automatica dels GIFS animats + setting_reduce_motion: Reduire la velocitat de las animacions setting_boost_modal: Afichar una fenèstra de confirmacion abans de partejar un estatut setting_default_privacy: Confidencialitat de las publicacions setting_default_sensitive: Totjorn marcar los mèdias coma sensibles -- cgit From 3c530d95f66c3408b438aba924e943e4af35f92e Mon Sep 17 00:00:00 2001 From: Marcin Mikołajczak Date: Mon, 16 Oct 2017 14:09:51 +0200 Subject: i18n: Update Polish translation (#5416) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- app/javascript/mastodon/locales/pl.json | 1 + config/locales/simple_form.en.yml | 2 +- config/locales/simple_form.pl.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index c8228c0cb..77da77e10 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -179,6 +179,7 @@ "status.load_more": "Załaduj więcej", "status.media_hidden": "Zawartość multimedialna ukryta", "status.mention": "Wspomnij o @{name}", + "status.more": "Więcej", "status.mute_conversation": "Wycisz konwersację", "status.open": "Rozszerz ten wpis", "status.pin": "Przypnij do profilu", diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 5a58e8667..aafae48ce 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -39,12 +39,12 @@ en: otp_attempt: Two-factor code password: Password setting_auto_play_gif: Auto-play animated GIFs - setting_reduce_motion: Reduce motion in animations setting_boost_modal: Show confirmation dialog before boosting setting_default_privacy: Post privacy setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot setting_noindex: Opt-out of search engine indexing + setting_reduce_motion: Reduce motion in animations setting_system_font_ui: Use system's default font setting_theme: Site theme setting_unfollow_modal: Show confirmation dialog before unfollowing someone diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index e5d408973..68f84d109 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -48,6 +48,7 @@ pl: setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych + setting_reduce_motion: Ogranicz ruch w animacjach setting_system_font_ui: Używaj domyślnej czcionki systemu setting_theme: Motyw strony setting_unfollow_modal: Pytaj o potwierdzenie przed cofnięciem śledzenia -- cgit