tolk 1.3.9 → 1.3.10

data/app/assets/javascripts/tolk/actions.js

@@ -5,23 +5,18 @@ $(function () {
     e.preventDefault();
 
     var row = $(this).parents("tr")
-      , original = row.find(".phrase .original").text();
+      , original_text = row.find(".original textarea").val();
 
-    row.find(".translation textarea").addClass("dirty").val(original.trim());
-
-    // Bind the dirty callback after copy
-    window.onbeforeunload = confirm;
+    row.find(".translation textarea").val(original_text.trim()).trigger("change");
   });
 
   // avoid lose data
-  $(".translations textarea").bind("blur", function () {
-    if ($(this).is(".dirty")) {
-      window.onbeforeunload = confirm;
-    }
+  $(".translations textarea").bind("keydown", function () {
+    window.onbeforeunload = confirm;
   });
 
-  $(".translations textarea").bind("keydown", function () {
-    $(this).addClass("dirty");
+  $(".translations textarea").bind("change", function () {
+    window.onbeforeunload = confirm;
   });
 
   $("input.save, input.apply").click(function () {

data/app/assets/javascripts/tolk/interpolations.js

@@ -1,37 +1,21 @@
 $(function () {
-  var interpolation = new RegExp("%{\\w+}", "g");
-
-  $(".phrase .value").each(function () {
-    var text = $('<div/>').text($(this).text()).html()
-      , token_text;
-
-    token_text = text.replace(interpolation, function (match) {
-      return '<span class="interpolation"  title="Don\'t translate this word">' + match + '</span>';
-    });
-
-    $(this).html(token_text);
-  });
 
-  $(".translations textarea").bind("focus", function () {
-    $(this).parents("tr").toggleClass('active');
-  });
-
-  $(".translations textarea").bind("blur", function () {
-    $(this).parents("tr").toggleClass('active');
-
-    var row = $(this).parents("tr")
-      , original_text = row.find(".phrase .original").text()
-      , translated_text = $(this).val()
-      , original_interpolations = original_text.match(interpolation) || []
-      , translated_interpolations = translated_text.match(interpolation) || []
-      , not_match;
+  var interpolation = new RegExp("%{\\w+}", "g");
+  
+  $(".translations textarea").bind("change", function () {
+      var row = $(this).parents("tr")
+        , original_text = row.find(".original textarea").val()
+        , translated_text = $(this).val()
+        , original_interpolations = original_text.match(interpolation) || []
+        , translated_interpolations = translated_text.match(interpolation) || []
+        , not_match;
 
-    not_match = translated_text.length > 0 &&
-                ($(original_interpolations).not(translated_interpolations).length !== 0 ||
-                 $(translated_interpolations).not(original_interpolations).length !== 0);
+      not_match = translated_text.length > 0 &&
+                  ($(original_interpolations).not(translated_interpolations).length !== 0 ||
+                   $(translated_interpolations).not(original_interpolations).length !== 0);
 
-    row.find(".actions .warning").toggle(not_match);
+      row.find(".actions .warning").toggle(not_match);
 
-  });
+    });
 
 });

data/app/assets/javascripts/tolk/layout.js

@@ -1,9 +1,17 @@
-
 $(function () {
 
   // Fit text area height
-  $('td textarea').each(function () {
+  $('.translations textarea').each(function () {
     $(this).css({ height: $(this).parent('td').css('height')});
   });
 
+  // Mark active textarea
+  $(".translations textarea").bind("focus", function () {
+    $(this).parents("tr").toggleClass('active');
+  });
+
+  $(".translations textarea").bind("blur", function () {
+    $(this).parents("tr").toggleClass('active');
+  });
+
 });

data/app/assets/stylesheets/tolk/screen.css

@@ -241,7 +241,7 @@ span.notice {
   display: inline-block;
 }
 
-div.original {
+div.previous {
   color: #999;
   margin: 5px 0;
   padding: 1px 8px 4px;
@@ -252,7 +252,7 @@ div.updated {
   padding: 1px 8px 4px;
 }
 
-table.translations div.original span.key {
+table.translations div.previous span.key {
   margin: 0 0 -2px;
   padding: 0;
 }
@@ -332,7 +332,7 @@ table.translations td.actions .warning {
   color: orange;
   padding: 2px 4px;
   display: none;
-  cursor: default;
+  cursor: help;
 }
 
 table.translations tr.active td {
@@ -343,20 +343,21 @@ table.translations .highlight {
   background-color: yellow;
 }
 
-table.translations .original {
+table.translations .original textarea {
   display: none;
 }
 
-table.translations .interpolation {
+table.translations .original .interpolation, 
+table.translations .original .carriage_return,
+table.translations .original .boolean  {
   color: #2fadcf;
-  font-family: Courier;
+  font-family: Courier, monospace;
   font-weight: bold;
-  cursor: pointer;
+  cursor: help;
 }
 
-table.translations .phrase .carriage_return, table.translations .phrase .boolean {
-  color: #2fadcf;
-  font-weight: bold;
+table.translations .original .carriage_return:before {
+  content: "¶";
 }
 
 /*-------------------------------------------------

data/app/helpers/tolk/application_helper.rb

@@ -1,7 +1,17 @@
 module Tolk
   module ApplicationHelper
     def format_i18n_value(value)
-      h(yaml_value(value)).gsub(/\n/, '<span class="carriage_return">&crarr;</span><br />').html_safe
+      value = h(yaml_value(value))
+      value = highlight_linebreaks(value)
+      value = highligh_interpolations(value)
+    end
+
+    def highlight_linebreaks(value)
+      value.gsub(/\n/, '<span class="carriage_return" title="Line break"><br /></span>').html_safe
+    end
+
+    def highligh_interpolations(value)
+      value.gsub(/%{\w+}/, '<span class="interpolation" title="Leave this word untranslated">\0</span>').html_safe
     end
 
     def format_i18n_text_area_value(value)

data/app/models/tolk/locale.rb

@@ -51,12 +51,9 @@ module Tolk
         all - [primary_locale]
       end
 
-      def dump_all(to = self.locales_config_path)
+      def dump_all(to = nil, exporter = Tolk::Export)
         secondary_locales.each do |locale|
-          File.open("#{to}/#{locale.name}.yml", "w+") do |file|
-            data = locale.to_hash
-            data.respond_to?(:ya2yaml) ? file.write(data.ya2yaml(:syck_compatible => true)) : file.write(YAML.dump(data).force_encoding file.external_encoding.name)
-          end
+          exporter.dump(name: locale.name, data: locale.to_hash, destination: to)
         end
       end
 

data/app/models/tolk/translation.rb

@@ -61,6 +61,7 @@ module Tolk
         end
         super unless value == text
       else
+        value = value.strip if value.is_a?(String)
         super unless value.to_s == text
       end
     end

data/app/views/tolk/locales/all.html.erb

@@ -30,25 +30,21 @@
               <a class="copy" href="#" tabindex="-1" title="Copy original translation">&larr;</a><br>
               <span class="warning" title="Interpolation keys don't match">⚠</span>
             </td>
-            <td class="phrase">
-
+            <td class="original">
+              <%= text_area_tag :"translations[][original_text]", format_i18n_text_area_value(phrase.translations.primary.text), :disabled => true %>
+              
               <% if action_name == 'updated' %>
                 <div class="updated">
                   <span class="key">Updated</span>
                   <%= format_i18n_value(phrase.translations.primary.text) -%>
                   <%= boolean_warning if phrase.translations.primary.boolean? -%>
                 </div>
-                <div class="original">
-                  <span class="key">Original</span>
+                <div class="previous">
+                  <span class="key">Previous</span>
                   <%= format_i18n_value(phrase.translations.primary.previous_text) -%>
                 </div>
               <% else %>
-                <div class="original">
-                  <%= format_i18n_value(phrase.translations.primary.text) -%>
-                </div>
-                <div class="value">
-                  <%= format_i18n_value(phrase.translations.primary.text) -%>
-                </div>
+                <%= format_i18n_value(phrase.translations.primary.text) -%>
                 <%= boolean_warning if phrase.translations.primary.boolean? -%>
               <% end %>
 

data/app/views/tolk/locales/show.html.erb

@@ -34,18 +34,16 @@
               <a class="copy" href="#" tabindex="-1" title="Copy original translation">&larr;</a><br>
               <span class="warning" title="Interpolation keys don't match">⚠</span>
             </td>
-            <td class="phrase">
-              <div class="original">
+            <td class="original">
+              <%= text_area_tag :"translations[][original_text]", format_i18n_text_area_value(phrase.translations.primary.text), :disabled => true %>
+
+              <% if params[:q].present? -%>
+                <%= highlight(format_i18n_value(phrase.translations.primary.text), params[:q]) -%>
+              <% else -%>
                 <%= format_i18n_value(phrase.translations.primary.text) -%>
-              </div>
-              <div class="value">
-                <% if params[:q].present? -%>
-                  <%= highlight(format_i18n_value(phrase.translations.primary.text), params[:q]) -%>
-                <% else -%>
-                  <%= format_i18n_value(phrase.translations.primary.text) -%>
-                <% end -%>
-                <%= boolean_warning if phrase.translations.primary.boolean? -%>
-              </div>
+              <% end -%>
+              <%= boolean_warning if phrase.translations.primary.boolean? -%>
+
               <span class="key" title="<%= phrase.key %>"><%= truncate(phrase.key, :length => 100) %></span>
             </td>
           </tr>

data/app/views/tolk/searches/show.html.erb

@@ -31,21 +31,19 @@
                 <a class="copy" href="#" tabindex="-1" title="Copy original translation">&larr;</a><br>
                 <span class="warning" title="Interpolation keys don't match">⚠</span>
               </td>
-              <td class="phrase">
-                <div class="original">
+              <td class="original">
+                <%= text_area_tag :"translations[][original_text]", format_i18n_text_area_value(phrase.translations.primary.text), :disabled => true %>
+
+                <% if params[:q].present? -%>
+                  <%= highlight(format_i18n_value(phrase.translations.primary.text), params[:q]) -%>
+                <% else -%>
                   <%= format_i18n_value(phrase.translations.primary.text) -%>
-                </div>
-                <div class="value">
-                  <% if params[:q].present? -%>
-                    <%= highlight(format_i18n_value(phrase.translations.primary.text), params[:q]) -%>
-                  <% else -%>
-                    <%= format_i18n_value(phrase.translations.primary.text) -%>
-                  <% end -%>
-                  <%= boolean_warning if phrase.translations.primary.boolean? -%>
-                </div>
+                <% end -%>
+                <%= boolean_warning if phrase.translations.primary.boolean? -%>
+                
                 <span class="key" title="<%= phrase.key %>"><%= params[:k].present? ?
-                  highlight(h(truncate(phrase.key, :length => 100)), params[:k]) :
-                  h(truncate(phrase.key, :length => 100)) %></span>
+                highlight(h(truncate(phrase.key, :length => 100)), params[:k]) :
+                h(truncate(phrase.key, :length => 100)) %></span>
               </td>
             </tr>
           <% end %>

data/lib/tolk.rb

@@ -4,6 +4,7 @@ require 'tolk/config'
 require 'tolk/engine'
 require 'tolk/sync'
 require 'tolk/import'
+require 'tolk/export'
 
 module Tolk
   # Setup Tolk

data/lib/tolk/export.rb

@@ -0,0 +1,28 @@
+module Tolk
+  class Export
+    attr_reader :name, :data, :destination
+
+    def initialize(args)
+      @name = args.fetch(:name, '')
+      @data = args.fetch(:data, {})
+      @destination = args.fetch(:destination, self.class.dump_path)
+    end
+
+    def dump
+      File.open("#{destination}/#{name}.yml", "w+") do |file|
+        data.respond_to?(:ya2yaml) ? file.write(data.ya2yaml(:syck_compatible => true)) : file.write(YAML.dump(data).force_encoding file.external_encoding.name)
+      end
+    end
+
+    class << self
+      def dump(args)
+        new(args).dump
+      end
+
+      def dump_path
+        Tolk::Locale._dump_path
+      end
+    end
+
+  end
+end

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.3.9"
+  VERSION = "1.3.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -64,6 +64,7 @@ files:
 - lib/tasks/tolk_tasks.rake
 - lib/tolk/config.rb
 - lib/tolk/engine.rb
+- lib/tolk/export.rb
 - lib/tolk/import.rb
 - lib/tolk/sync.rb
 - lib/tolk/version.rb