i18nline 0.0.8.alpha → 0.0.10.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 190237220ad03c94845f1bc328fe174afb79b991
-  data.tar.gz: 5fc07ed257c12b829ec203ca7822cb98b95330d8
+  metadata.gz: 84be485a4a066f3df39cb5e042119dd5fc148fd8
+  data.tar.gz: 3795a0deaff69a57779f1eb6d4456ec9d629fd23
 SHA512:
-  metadata.gz: 3e354c5232f27c88d5d9ad21622a47b9d47443e3639618745219e9b17bc0e561d772e52bc118a29fb37a51a8a56dbc006fa568d25fae67781221efb8135e9a72
-  data.tar.gz: 1c68a02650571a608efac21ae567a6abbfbf2669dcf3a38a0a07605f73d13fb80f965dd993e6d186dbbbce01600eaee12365c56595f77a6adbb3881ad4142e55
+  metadata.gz: a2e0c707fe888eed80b4b9d181ea0029bd296748589f05a151f0af94fd8dd67e5a7b3e05e5f0f7358c90c72a8a2bccfc8610d2614a5109b954f484e6705ae1f9
+  data.tar.gz: ba3161979348cbf5708444b5bd7b27593d61d95326be4a0df7d09db84cb2d4d7466cb23e0240184bc5dea2e845b6e57a983a8d5a39b01cdaf5807fcc9b9694a7

data/app/assets/stylesheets/i18nline/_base.css

@@ -2,6 +2,10 @@
   background-color: #EED3D7;
 }
 
+#edit_key_set .panel-warning{
+  background-color: #FBEED5;
+}
+
 body {
   font-size: 14px !important;
 }

data/app/controllers/i18nline/translations_controller.rb

@@ -31,6 +31,8 @@ module I18nline
         is_proc: translations.first.is_proc
       )
 
+      @should_show_yaml_warning = check_yaml_warning(translations)
+
       render "edit_key" and return
     end
 
@@ -52,12 +54,12 @@ module I18nline
       params[:tr_set][:translation].each do |translation|
         db_translation = Translation.find(translation.first)
         if db_translation
-          db_translation.value = translation.last[:value]
+          db_translation.value = convert_to_object(translation.last[:value])
           db_translation.is_proc = is_proc
           if translation.last[:make_nil].presence == "1"
             # it is likely that if value was nil and now is not, 'make_nil' has been left marked
             # as a mistake, so in that case we ignore it and apply the new value:
-            unless db_translation.value_changed? and db_translation.value_was.nil?
+            unless db_translation.value_changed? && db_translation.value_was.nil? && db_translation.value.present?
               db_translation.value = nil
             end
           end
@@ -69,18 +71,6 @@ module I18nline
       redirect_to :translations, notice: "Update successful."
     end
 
-    # PATCH/PUT /translations/1
-    def update
-      if translation_params[:make_nil].presence == "1"
-        params[:translation][:value] = nil
-      end
-      if @translation.update(translation_params)
-        redirect_to @translation, notice: 'Translation was successfully updated.'
-      else
-        render action: 'edit'
-      end
-    end
-
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_translation
@@ -91,5 +81,29 @@ module I18nline
       def translation_params
         params.require(:translation).permit(:value, :is_proc, :make_nil)
       end
+
+      def convert_to_object(value)
+        # gsub part is keeping integrity of serialized objects, such as arrays:
+        result = value.gsub("\r\n", "\n")
+        if value.start_with?("---")
+          begin
+            result = YAML::load(value)
+          rescue Exception => exception
+            logger.debug "I18nline: Exception found trying to  parse yaml to convert translation value to object:"
+            logger.debug exception
+          end
+        end
+        result
+      end
+
+      def check_yaml_warning(translations)
+        should_show = false
+        if I18nline.show_yaml_warning
+          if translations.select{|tt| tt.value and tt.value.class != String}.any?
+            should_show = true
+          end
+        end
+        should_show
+      end
   end
 end

data/app/views/i18nline/translations/edit_key.html.erb

@@ -22,6 +22,14 @@
           </div>
         </div>
       </div>
+      <% if @should_show_yaml_warning %>
+        <div class="panel panel-default panel-warning">
+          <div class="panel-body">
+            Please, <b>note:</b> <br>
+            At least one translation below is using <a href="http://en.wikipedia.org/wiki/Yaml">Yaml</a>. If you are not familiar with Yaml and serialization, please don't touch the dashes at the beginning of some lines.
+          </div>
+        </div>
+      <% end %>
       <% @tr_set.translations.each do |translation| %>
         <% panel_color = translation.value.nil? ? "panel-danger" : "panel-info" %>
         <div class="panel panel-default <%= panel_color %>">
@@ -29,8 +37,10 @@
             <%= f.fields_for "translation[]", translation do |tl_form| %>
               <div class="input-group col-sm-offset-2">
                 <span class="input-group-addon"><%= translation.locale %></span>
-                <% rows = (translation.value.to_s.length / 100) + 1 %>
-                <%= tl_form.text_area :value, class: "form-control", rows: "#{rows}" %>
+                <% translation.value = translation.value.to_yaml if translation.value && translation.value.class != String %>
+                <% rows = (translation.value.to_s.length / 120) + 1 %>
+                <% height = rows * 36 %>
+                <%= tl_form.text_area :value, class: "form-control", style: "height:#{height}px !important;" %>
               </div>
               <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-10">

data/lib/generators/i18nline/templates/config/initializers/i18nline.rb

@@ -18,4 +18,10 @@ I18nline.setup do |config|
 
   # Missing translations will be generated for this locales.
   #config.enabled_locales = %w(en es it)
+
+  # Complex translations use serialized yaml objects. If the translator changes
+  # the serialization markers, the translation can be made unusable.
+  # If 'show_yaml_warning' is set to true, a warning message will appear
+  # when accessing a translation set presenting serialized data.
+  #config.show_yaml_warning = true
 end

data/lib/i18nline/version.rb

@@ -1,3 +1,3 @@
 module I18nline
-  VERSION = "0.0.8.alpha"
+  VERSION = "0.0.10.alpha"
 end

data/lib/i18nline.rb

@@ -18,6 +18,9 @@ module I18nline
   mattr_accessor :enabled_locales
   @@enabled_locales = %w(en es it)
 
+  mattr_accessor :show_yaml_warning
+  @@show_yaml_warning = true
+
   def self.setup
     yield self
   end

data/test/dummy/config/initializers/i18nline.rb

@@ -18,4 +18,10 @@ I18nline.setup do |config|
 
   # Missing translations will be generated for this locales.
   config.enabled_locales = %w(en es it pt)
+
+  # Complex translations use serialized yaml objects. If the translator changes
+  # the serialization markers, the translation can be made unusable.
+  # If 'show_yaml_warning' is set to true, a warning message will appear
+  # when accessing a translation set presenting serialized data.
+  config.show_yaml_warning = true
 end