expat 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 436114e3e51cbd41fa83aad8b22772f4c44b127d
-  data.tar.gz: b0f16ab44d8d6fb85ab73bb103b5afe91e80caac
+  metadata.gz: c9205ebd1f04d3cc1ea7d0635dc4a00e8d3e6b31
+  data.tar.gz: ada39731405acbc07114da232971fc4ffec36e2a
 SHA512:
-  metadata.gz: 5785307062fd5f47e4766077c5a8f6b7cbaf757d3377f4d0d1a6a74881035b05551895fdf25178f9704816e176ff128aca384cf6f4c5d3997763898e24526d33
-  data.tar.gz: f82276bb48c22769e20b8117428b368ced69e1b82db58ed6b31fa46bc0f9ab000991a4667352587e7c8ee8bba5fb50a86ba41a0dd320a9dc6ad3ea48c05afbfb
+  metadata.gz: e4d9138016aa8389c8854e0e5b71ba75570915df550ee4c296f84389021f774f4e6c98de5a272884c8a73bab9c85ae3a7fe348c422700b9f8d1097e48f00854c
+  data.tar.gz: a23282e10acb1ddabf580920bf4afda8940acc84d52d3bc3a284de5b217baa7b4b78e48c7e26bb32579958b69f70f15cd62da09fe623c680f8038e390f48d454

data/app/assets/stylesheets/expat/application.css

@@ -21,3 +21,8 @@ table {
 td {
   border: 1px solid #ccc;
 }
+
+.translation_missing {
+  background: #f00;
+  color: #fff;
+}

data/app/controllers/expat/application_controller.rb

@@ -1,5 +1,19 @@
 module Expat
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
+
+    protected
+
+    def list_locales
+      locales = []
+
+      Dir.open("#{Rails.root}/config/locales").each do |file|
+        unless ['.', '..'].include?(file) || file[0] == '.'
+          locales << file[0...-4] # strip of .yml
+        end
+      end
+
+      locales
+    end
   end
 end

data/app/controllers/expat/locales_controller.rb

@@ -3,13 +3,7 @@ require_dependency 'expat/application_controller'
 module Expat
   class LocalesController < ApplicationController
     def index
-      @locales = []
-
-      Dir.open("#{Rails.root}/config/locales").each do |file|
-        unless ['.', '..'].include?(file) || file[0] == '.'
-          @locales << file[0...-4] # strip of .yml
-        end
-      end
+      @locales = list_locales
     end
   end
 end

data/app/controllers/expat/translations_controller.rb

@@ -5,6 +5,7 @@ module Expat
     before_action :load_translations
 
     def index
+      @translations = append_missing_translations @locale, @translations
     end
 
     def edit
@@ -36,9 +37,28 @@ module Expat
 
     def load_translations
       @locale = params[:locale_id]
-      path = "#{Rails.root}/config/locales/#{@locale}.yml"
+      @translations = load_translation @locale
+    end
+
+    def load_translation locale
+      path = "#{Rails.root}/config/locales/#{locale}.yml"
       yml = YAML.load_file path
-      @translations = iterate yml[@locale], ''
+      iterate yml[locale], ''
+    end
+
+    def append_missing_translations current, current_translations
+      result = {}
+
+      list_locales.each do |locale|
+        next if current == locale
+
+        translation = load_translation locale
+        (current_translations.keys | translation.keys).each do |key|
+          result[key] = current_translations[key]
+        end
+      end
+
+      result
     end
 
     def save_translations

data/app/views/expat/translations/_form.html.erb

@@ -1,5 +1,5 @@
 <%
-  if @translation.nil?
+  unless params[:id].present?
     url = locale_translations_path
     method = :post
   else
@@ -9,7 +9,7 @@
 %>
 <%= form_tag url, method: method do |f| %>
 
-  <% if @translation.nil? %>
+  <% unless params[:id].present? %>
     <%= label_tag :key %>
     <%= text_field_tag :key %><br />
 

data/app/views/expat/translations/index.html.erb

@@ -7,8 +7,13 @@
         <%= key %>
       </td>
       <td>
-        <%= link_to value, edit_locale_translation_path(
-            locale_id: @locale, id: key) %>
+        <%= link_to edit_locale_translation_path(
+            locale_id: @locale, id: key) do %>
+          <%= value %>
+          <% if value.blank? %>
+            <span class="translation_missing">missing</span>
+          <% end %>
+        <% end %>
       </td>
       <td>
         <%= form_tag locale_translation_path(locale_id: @locale, id: key),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expat
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Frank Groeneveld