translate-rails3 0.2.0 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/app/controllers/translate_controller.rb

@@ -1,7 +1,14 @@
 class TranslateController < ActionController::Base
   # It seems users with active_record_store may get a "no :secret given" error if we don't disable csrf protection,
   skip_before_filter :verify_authenticity_token
+  
+#  password = `hostname`.chomp
+#  Rails.logger.info("The translation password is #{password}")
+#  http_basic_authenticate_with :name => "translate", :password => password
+
+  protected
 
+ 
   prepend_view_path(File.join(File.dirname(__FILE__), "..", "views"))
   layout 'translate'
 

data/app/helpers/translate_helper.rb

@@ -1,20 +1,5 @@
 module TranslateHelper
 
-	def render_translate_form(from_locale, to_locale, key)
-		from_text = lookup(from_locale, key)
-		if from_text.is_a?(String)
-			render :partial => 'string_form', :locals =>
-				{:from_locale => from_locale,
-					:to_locale => to_locale,
-					:key => key}
-		elsif from_text.is_a?(Array)
-			render :partial => 'array_form', :locals =>
-				{:from_locale => from_locale,
-					:to_locale => to_locale,
-					:key => key}
-		end
-	end
-
 	def from_locales
 		# Attempt to get the list of locale from configuration
 		from_loc = Rails.application.config.from_locales if Rails.application.config.respond_to?(:from_locales)

data/app/views/layouts/translate.html.erb

@@ -301,6 +301,7 @@
 	div.translation{
 		padding:1em;
 		border-bottom:solid 0.2em #d46021;
+    border-left: solid 0.1em #D46021;
 		margin:0 1em 1em 1.6em;
 	}
 	div.translation input, div.translation textarea{

data/app/views/translate/index.html.erb

@@ -1,53 +1,53 @@
 <%
-  @page_title = "Translate"
-  show_filters = ["all", "untranslated", "translated"]
-  show_filters << "changed" if @from_locale != @to_locale
+@page_title = "Translate"
+show_filters = ["all", "untranslated", "translated"]
+show_filters << "changed" if @from_locale != @to_locale
 %>
 
 <fieldset>
-	<legend>Search filter</legend>
-	<div id="show-sort">
-		<p>
-		 <label>Show:</label> <%=  raw simple_filter(show_filters) %>
-		</p>
-		<p>
-		 <label>Sort by:</label> <%= raw simple_filter(["key", "text"], 'sort_by') %>
-		</p>
-	</div>
-  <%= form_tag(params, :method => :get) do %>
-  <div id="languages">
-   <p>
-     <%= hidden_field_tag(:filter, params[:filter]) %>
-     <%= hidden_field_tag(:sort_by, params[:sort_by]) %>
-     <label>Translate from</label>
-     <%= select_tag(:from_locale, options_for_select(from_locales, @from_locale.to_sym)) %> <span>to</span>
-     <%= select_tag(:to_locale, options_for_select(to_locales, @to_locale.to_sym)) %>
-     <%= submit_tag "Display" %>
-   </p>
-  </div>
-  <div id="filter-pattern">
-  <p>
-     <label for="key_pattern_value">Key</label>
-     <%= select_tag(:key_type, options_for_select([["contains", 'contains'], ["starts with", 'starts_with']], params[:key_type])) %>
-     <%= text_field_tag(:key_pattern, params[:key_pattern], :size => 50, :id => "key_pattern_value", :class => "text-default") %>
-   </p>
-   <p>
-     <label for="text_pattern_value">Text</label>
-     <%= select_tag(:text_type, options_for_select(['contains', 'equals'], params[:text_type])) %>
-     <%= text_field_tag(:text_pattern, params[:text_pattern], :size => 50, :id => "text_pattern_value", :class => "text-default") %>	     
-   </p>
-   <p>
-    <%= submit_tag "Search" %>
-    <%= link_to "clear", params.merge({:text_pattern => nil, :key_pattern => nil}) %>
+  <legend>Search filter</legend>
+  <div id="show-sort">
+    <p>
+      <label>Show:</label> <%=  raw simple_filter(show_filters) %>
+    </p>
+    <p>
+      <label>Sort by:</label> <%= raw simple_filter(["key", "text"], 'sort_by') %>
     </p>
   </div>
+  <%= form_tag(params, :method => :get) do %>
+    <div id="languages">
+      <p>
+        <%= hidden_field_tag(:filter, params[:filter]) %>
+        <%= hidden_field_tag(:sort_by, params[:sort_by]) %>
+        <label>Translate from</label>
+        <%= select_tag(:from_locale, options_for_select(from_locales, @from_locale.to_sym)) %> <span>to</span>
+        <%= select_tag(:to_locale, options_for_select(to_locales, @to_locale.to_sym)) %>
+        <%= submit_tag "Display" %>
+      </p>
+    </div>
+    <div id="filter-pattern">
+      <p>
+        <label for="key_pattern_value">Key</label>
+        <%= select_tag(:key_type, options_for_select([["contains", 'contains'], ["starts with", 'starts_with']], params[:key_type])) %>
+        <%= text_field_tag(:key_pattern, params[:key_pattern], :size => 50, :id => "key_pattern_value", :class => "text-default") %>
+      </p>
+      <p>
+        <label for="text_pattern_value">Text</label>
+        <%= select_tag(:text_type, options_for_select(['contains', 'equals'], params[:text_type])) %>
+        <%= text_field_tag(:text_pattern, params[:text_pattern], :size => 50, :id => "text_pattern_value", :class => "text-default") %>	     
+      </p>
+      <p>
+        <%= submit_tag "Search" %>
+        <%= link_to "clear", params.merge({:text_pattern => nil, :key_pattern => nil}) %>
+      </p>
+    </div>
   <% end %>
-	<p class="hits">
-	  Found <strong><%= @total_entries %></strong> messages
-	</p>
-	<p>
-	 <%= link_to "Reload messages", translate_reload_path %>
-	</p>
+  <p class="hits">
+    Found <strong><%= @total_entries %></strong> messages
+  </p>
+  <p>
+    <%= link_to "Reload messages", translate_reload_path %>
+  </p>
 </fieldset>
 
 
@@ -56,32 +56,35 @@
 </div>
 
 <% if @total_entries > 0 %>
-<%= form_tag(translate_path) do %>
-  <div>
+  <%= form_tag(translate_path) do %>
+    <div>
       <%= hidden_field_tag(:filter, params[:filter], :id => "hid_filter") %>
       <%= hidden_field_tag(:sort_by, params[:sort_by], :id => "hid_sort_by") %>
       <%= hidden_field_tag(:key_type, params[:key_type], :id => "hid_key_type") %>
       <%= hidden_field_tag(:key_pattern, params[:key_pattern], :id => "hid_key_pattern") %>
       <%= hidden_field_tag(:text_type, params[:text_type], :id => "hid_text_type") %>
       <%= hidden_field_tag(:text_pattern, params[:text_pattern], :id => "hid_text_pattern") %>
-  </div>
-  <div class="translations">
-	  <h2>Translations from <%= @from_locale %> to <%= @to_locale %></h2>
-    <p class="translate">
-	    <%= submit_tag "Save Translations" %>
-	  </p>
-	  <% @paginated_keys.each do |key| %>
-			<%= 
-				# this is a helper method, we need to determine if the thing we are trying to translate is
-				# a string or an array, and it would be very messey if i put everything in this view
-				render_translate_form(@from_locale, @to_locale, key)
-			%>
-		<% end %>
-  <p class="translate">
-    <%= submit_tag "Save Translations" %>
-	</p>
-</div>
-<% end %>
+    </div>
+    <div class="translations">
+      <h2>Translations from <%= @from_locale %> to <%= @to_locale %></h2>
+      <p class="translate">
+        <%= submit_tag "Save Translations" %>
+      </p>
+      <% @paginated_keys.each do |key| %>
+        <%= 
+        from_text = lookup(@from_locale, key)
+        render (from_text.is_a?(Array) ? 'array_form' : 'string_form'), {
+          :from_locale => @from_locale,
+          :to_locale => @to_locale,
+          :key => key,
+        }
+      %>
+      <% end %>
+      <p class="translate">
+        <%= submit_tag "Save Translations" %>
+      </p>
+    </div>
+  <% end %>
 <% end %>
 
 <div class="paging">

data/config/routes.rb

@@ -2,4 +2,4 @@ Rails.application.routes.draw do
   match 'translate' => 'translate#index', :as => :translate_list
   match 'translate/translate' => 'translate#translate', :as => :translate
   match 'translate/reload' => 'translate#reload', :as => :translate_reload
-end if Rails.env.development?
+end

data/translate-rails3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "translate-rails3"
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Marklund", "Milan Novota", "Roman Shterenzon"]
-  s.date = "2011-12-16"
+  s.date = "2012-01-16"
   s.description = "This plugin provides a web interface for translating Rails I18n texts\n(requires Rails 3.0 or higher) from one locale to another.\nThe plugin has been tested only with the simple I18n backend that ships\nwith Rails.\nI18n texts are read from and written to YAML files under config/locales.\n\nThis gem is a fork of the original https://github.com/mynewsdesk/translate\nand also includes work from this fork: https://github.com/milann/translate\n"
   s.email = "romanbsd@yahoo.com"
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: translate-rails3
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors: 
 - Peter Marklund
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 Z
+date: 2012-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ya2yaml