diff --git a/app/views/fluentd/edit.html.haml b/app/views/fluentd/edit.html.haml index 56d9513..dffb2a5 100644 --- a/app/views/fluentd/edit.html.haml +++ b/app/views/fluentd/edit.html.haml @@ -1,3 +1,3 @@ - page_title t('.page_title') -= render partial: "form", locals: { btn: t(".update"), url: daemon_path(@fluentd), method: :patch } += render partial: "form", locals: { btn: t("terms.update"), url: daemon_path(@fluentd), method: :patch } diff --git a/app/views/fluentd/new.html.haml b/app/views/fluentd/new.html.haml index 861b7f1..2640fd0 100644 --- a/app/views/fluentd/new.html.haml +++ b/app/views/fluentd/new.html.haml @@ -1,3 +1,3 @@ - page_title t('.page_title') -= render partial: "form", locals: { btn: t(".create"), url: daemon_path, method: :post } += render partial: "form", locals: { btn: t("terms.create"), url: daemon_path, method: :post } diff --git a/app/views/fluentd/settings/edit.html.haml b/app/views/fluentd/settings/edit.html.haml index 267a2cd..f431d17 100644 --- a/app/views/fluentd/settings/edit.html.haml +++ b/app/views/fluentd/settings/edit.html.haml @@ -4,4 +4,4 @@ %div.form-group = text_area_tag "config", @config, class: "form-control", rows: 40 %p.text.text-danger= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand) - = submit_tag t(".update"), class: "btn btn-primary" + = submit_tag t("terms.update"), class: "btn btn-primary" diff --git a/config/locales/translation_en.yml b/config/locales/translation_en.yml index 43c88f2..a2a6246 100644 --- a/config/locales/translation_en.yml +++ b/config/locales/translation_en.yml @@ -70,9 +70,8 @@ en: show: page_title: Password - fluentd: &fluentd - common: &fluentd_common - <<: *terms + fluentd: + common: start: Start stop: Stop restart: Restart @@ -99,20 +98,16 @@ en: Delete %{brand} setting.

Running %{brand} will be stopped, but log and config file are still exists.

- form: - <<: *fluentd_common show: page_title: Dashboard new: - <<: *fluentd_common page_title: New edit: - <<: *fluentd_common page_title: Edit log: page_title: log errors: - page_title: エラーログ + page_title: Error log error_is_empty: No errors settings: source_and_output: @@ -123,7 +118,7 @@ en: page_title: Config File in_out_head: In/Out setting edit: - <<: *fluentd_common + page_title: Edit Config File out_forward: option_guide: | For each config parameter, pelase refer to the Forward output plugin documentation page. @@ -154,7 +149,6 @@ en: in_tail_option_guide: | For each config parameter, pelase refer to the Tail iutput plugin documentation page. in_tail: - <<: *fluentd_common restart_from_first: Restart from first grok_manual: |

@@ -193,16 +187,12 @@ en: show: - <<: *fluentd_common page_title: "Choose File Path" after_file_choose: - <<: *fluentd_common page_title: "Select File Format" after_format: - <<: *fluentd_common page_title: "Config Parameters" confirm: - <<: *fluentd_common page_title: "Confirmation" misc: diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml index 86eebdf..218e7da 100644 --- a/config/locales/translation_ja.yml +++ b/config/locales/translation_ja.yml @@ -48,7 +48,6 @@ ja: plugins: view_on_rubygems_org: rubygems.orgで見る common: - <<: *terms name: プラグイン名 status: 状態 authors: 作者 @@ -71,9 +70,8 @@ ja: show: page_title: パスワード管理 - fluentd: &fluentd - common: &fluentd_common - <<: *terms + fluentd: + common: start: 開始 stop: 停止 restart: 再起動 @@ -99,15 +97,11 @@ ja: %{brand}の設定を削除します。

起動中の%{brand}は停止し、ログや設定ファイルはそのまま残存します。

- form: - <<: *fluentd_common show: page_title: "ダッシュボード" new: - <<: *fluentd_common page_title: 追加 edit: - <<: *fluentd_common page_title: 編集 log: page_title: ログ @@ -115,7 +109,6 @@ ja: page_title: エラーログ error_is_empty: エラーはありません settings: - <<: *fluentd_common source_and_output: page_title: ソースと出力先の追加 in: 入力 @@ -123,7 +116,7 @@ ja: show: page_title: 設定ファイルの編集 edit: - <<: *fluentd_common + page_title: 設定ファイルの編集 out_forward: option_guide: | out_forwardプラグインの解説もご参照ください。 @@ -157,7 +150,6 @@ ja: in_tailプラグインの解説ページFluentularもご参照ください。 in_tail: - <<: *fluentd_common restart_from_first: 最初からやり直す grok_manual: |