Merge remote-tracking branch 'upstream/pull/3264'

[rails.git] / config / i18n-js.yml

diff --git a/config/i18n-js.yml b/config/i18n-js.yml
index 369fa340a2cd6611c538e9e93706ed0a7ea40154..b7f3b4dbcbae8c6b03e211c0827daceb05fbe163 100644 (file)
--- a/config/i18n-js.yml
+++ b/config/i18n-js.yml
@@ -1,34 +1,20 @@
-# Split context in several files.
-# By default only one file with all translations is exported and
-# no configuration is required. Your settings for asset pipeline
-# are automatically recognized.
-#
-# If you want to split translations into several files or specify
-# locale contexts that will be exported, just use this file to do
-# so.
-#
-# If you're going to use the Rails 3.1 asset pipeline, change
-# the following configuration to something like this:
-#
-#   translations:
-#     - file: "app/assets/javascripts/i18n/translations.js"
-#
-# If you're running an old version, you can use something
-# like this:
-#
-#   translations:
-#     - file: "public/javascripts/translations.js"
-#       only: "*"
-#
+export_i18n_js: false
+

 translations:
 translations:

-  - file: "app/assets/javascripts/i18n/translations.js"
+  - file: "app/assets/javascripts/i18n/%{locale}.js"
+    pretty_print: true

     only:
     - "*.date"
     - "*.time"
     - "*.browse.start_rjs.*"
     - "*.javascripts.*"
     only:
     - "*.date"
     - "*.time"
     - "*.browse.start_rjs.*"
     - "*.javascripts.*"

+    - "*.site.edit.*"

     - "*.site.index.remote_failed"
     - "*.site.sidebar.search_results"
     - "*.site.index.remote_failed"
     - "*.site.sidebar.search_results"

-    - "*.diary_entry.edit.marker_text"
+    - "*.diary_entries.edit.marker_text"

     - "*.layouts.project_name.title"
     - "*.geocoder.search_osm_nominatim.*"
     - "*.layouts.project_name.title"
     - "*.geocoder.search_osm_nominatim.*"

+  - file: "app/assets/javascripts/i18n/embed.js"
+    pretty_print: true
+    only:
+    - "*.javascripts.embed.*"