From 2bd132d4581048a96b4d36b5a94e6749c68b8987 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 4 May 2017 12:12:44 -0400 Subject: Replace best_in_place editor on admin settings page (#2789) * Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n --- config/locales/de.yml | 1 - config/locales/en.yml | 1 - config/locales/fa.yml | 3 +-- config/locales/fr.yml | 1 - config/locales/he.yml | 1 - config/locales/id.yml | 1 - config/locales/io.yml | 1 - config/locales/ja.yml | 1 - config/locales/nl.yml | 1 - config/locales/oc.yml | 1 - config/locales/pl.yml | 3 +-- config/locales/pt-BR.yml | 1 - config/locales/pt.yml | 1 - config/locales/ru.yml | 3 +-- config/locales/th.yml | 3 +-- config/locales/zh-CN.yml | 1 - config/locales/zh-HK.yml | 1 - config/locales/zh-TW.yml | 1 - config/navigation.rb | 2 +- config/routes.rb | 2 +- 20 files changed, 6 insertions(+), 24 deletions(-) (limited to 'config') diff --git a/config/locales/de.yml b/config/locales/de.yml index 7b8d09d10..b98c613f9 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -145,7 +145,6 @@ de: unresolved: Ungelöst view: Ansehen settings: - click_to_edit: Klicken zum Bearbeiten contact_information: email: Eine öffentliche E-Mail-Adresse angeben label: Kontaktinformationen diff --git a/config/locales/en.yml b/config/locales/en.yml index 936aa38d9..2210bd3c5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -158,7 +158,6 @@ en: unresolved: Unresolved view: View settings: - click_to_edit: Click to edit contact_information: email: Enter a public e-mail address label: Contact information diff --git a/config/locales/fa.yml b/config/locales/fa.yml index d118582a0..97792ede7 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -156,7 +156,6 @@ fa: unresolved: حل‌نشده view: نمایش settings: - click_to_edit: برای ویرایش کلیک کنید contact_information: email: یک نشانی ایمیل عمومی وارد کنید label: اطلاعات تماس @@ -297,7 +296,7 @@ fa: visibilities: private: نمایش تنها به پیگیران public: عمومی - unlisted: عمومی، ولی در فهرست نوشته‌ها نمایش نده + unlisted: عمومی، ولی در فهرست نوشته‌ها نمایش نده stream_entries: click_to_show: برای نمایش کلیک کنید reblogged: بازبوقیده diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f238d601a..db892619c 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -136,7 +136,6 @@ fr: unresolved: Non résolus view: Voir settings: - click_to_edit: Cliquez pour éditer contact_information: email: Entrez une adresse courriel publique label: Informations de contact diff --git a/config/locales/he.yml b/config/locales/he.yml index 0cda09add..282cff21e 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -157,7 +157,6 @@ he: unresolved: לא פתור view: תצוגה settings: - click_to_edit: לחיצה כדי לערוך contact_information: email: 'נא להקליד כתובת דוא"ל פומבית' label: פרטי התקשרות diff --git a/config/locales/id.yml b/config/locales/id.yml index 55c27ca08..14c8d0b59 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -156,7 +156,6 @@ id: unresolved: Belum Terseleseikan view: Tampilan settings: - click_to_edit: Klik untuk mengubah contact_information: email: Masukkan alamat email label: Informasi kontak diff --git a/config/locales/io.yml b/config/locales/io.yml index 4fad8423c..438fc301f 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -144,7 +144,6 @@ io: unresolved: Unresolved view: View settings: - click_to_edit: Click to edit contact_information: email: Enter a public e-mail address label: Contact information diff --git a/config/locales/ja.yml b/config/locales/ja.yml index af5e77d14..3f961bc93 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -157,7 +157,6 @@ ja: unresolved: 未解決 view: 表示 settings: - click_to_edit: クリックして編集 contact_information: email: 公開するメールアドレスを入力 label: 連絡先情報 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 3fb7c0487..f5a1068b8 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -41,7 +41,6 @@ nl: unfollow: Ontvolgen admin: settings: - click_to_edit: Klik om te bewerken contact_information: email: Vul een openbaar gebruikt e-mailadres in label: Contactgegevens diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 237b9c452..da1807582 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -146,7 +146,6 @@ oc: unresolved: Pas resolguts view: Veire settings: - click_to_edit: Clicatz per modificar contact_information: email: Picatz una adreça de corrièl label: Informacions de contacte diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 71877aada..8f88db22c 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -12,7 +12,7 @@ pl: domain_count_before: Serwer połączony z features: api: Otwarte API dla aplikacji i usług - blocks: Rozbudowane narzędzia blokowania i ukrywania + blocks: Rozbudowane narzędzia blokowania i ukrywania characters: 500 znaków na wpis chronology: Chronologiczny porządek wyświetlania ethics: 'Etyczne założenia: nie śledzimy, bez reklam' @@ -158,7 +158,6 @@ pl: unresolved: Nierozwiązane view: Wyświetl settings: - click_to_edit: Naciśnij, aby edytować contact_information: email: Wprowadź publiczny adres e-mail label: Informacje kontaktowe diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 067f908ba..2126a5529 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -157,7 +157,6 @@ pt-BR: unresolved: Unresolved view: View settings: - click_to_edit: Clique para editar contact_information: email: Entre um endereço de email público label: Informação de contato diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 2fc9f900f..cd841be51 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -152,7 +152,6 @@ pt: unresolved: Por resolver view: Ver settings: - click_to_edit: Clique para editar contact_information: email: Inserir um endereço de email para tornar público label: Informação de contacto diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 918b5a947..04e6d15f3 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -29,7 +29,7 @@ ru: terms: Условия user_count_after: пользователей user_count_before: Здесь живет - version: Версия + version: Версия accounts: follow: Подписаться followers: Подписчики @@ -139,7 +139,6 @@ ru: unresolved: Неразрешенные view: Просмотреть settings: - click_to_edit: Нажмите для изменения contact_information: email: Введите публичный e-mail label: Контактная информация diff --git a/config/locales/th.yml b/config/locales/th.yml index ae5273dd7..5383b31ab 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -35,7 +35,7 @@ th: followers: ผู้ติดตาม following: กำลังติดตาม nothing_here: ไม่พบสิ่งใดที่นี่! - people_followed_by: ถูกติดตามโดย %{name} + people_followed_by: ถูกติดตามโดย %{name} people_who_follow: คนที่ติดตาม %{name} posts: โพสต์ remote_follow: Remote follow @@ -157,7 +157,6 @@ th: unresolved: Unresolved view: วิว settings: - click_to_edit: คลิ๊กเพื่อแก้ไข contact_information: email: กรอกที่อยู่อีเมล์สาธารณะ label: ข้อมูลที่ติดต่อ diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index e3c4a41ca..67cd5b1b8 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -154,7 +154,6 @@ zh-CN: unresolved: 未处理 view: 查看 settings: - click_to_edit: 点击编辑 contact_information: email: 输入一个公开的电邮地址 label: 联系数据 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 26fd0855f..4f7a263b4 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -141,7 +141,6 @@ zh-HK: unresolved: 未處理 view: 檢視 settings: - click_to_edit: 點擊編輯 contact_information: email: 輸入一個公開的電郵地址 label: 聯絡資料 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index b5918e0ef..8f6f008ee 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -118,7 +118,6 @@ zh-TW: unresolved: 未解決 view: 檢視 settings: - click_to_edit: 點選以編輯 contact_information: email: 請輸入輸入一個公開電子信箱 label: 聯絡資訊 diff --git a/config/navigation.rb b/config/navigation.rb index 16bc86696..38dee91b2 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -23,7 +23,7 @@ SimpleNavigation::Configuration.run do |navigation| admin.item :domain_blocks, safe_join([fa_icon('lock fw'), t('admin.domain_blocks.title')]), admin_domain_blocks_url, highlights_on: %r{/admin/domain_blocks} admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' } admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' } - admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), admin_settings_url + admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url end primary.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' } diff --git a/config/routes.rb b/config/routes.rb index 1492f99fb..577a66923 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -76,7 +76,7 @@ Rails.application.routes.draw do namespace :admin do resources :pubsubhubbub, only: [:index] resources :domain_blocks, only: [:index, :new, :create, :show, :destroy] - resources :settings, only: [:index, :update] + resource :settings, only: [:edit, :update] resources :instances, only: [:index] resources :reports, only: [:index, :show, :update] do -- cgit