whowish_word 0.4.0 → 0.5.0

data/lib/whowish_word/action_view/base.rb

@@ -50,7 +50,7 @@ if defined?(ActionView) and defined?(ActionView::Base)
       if @whowish_word_config.edit_mode == true
         s = PREFIX + \
              SEPARATOR + \
-             uid.to_s + \
+             scope_key_by_partial(uid.to_s) + \
              SEPARATOR + \
              previous_t(uid, *variables)
         return "<dfn>#{s}</dfn>".html_safe
@@ -63,7 +63,7 @@ if defined?(ActionView) and defined?(ActionView::Base)
       if @whowish_word_config.edit_mode == true
         s = PREFIX + \
              SEPARATOR + \
-             uid.to_s + \
+             scope_key_by_partial(uid.to_s) + \
              SEPARATOR + \
              previous_t(uid, *variables)
         return s.html_safe

data/lib/whowish_word/rails/app/controllers/whowish_word_controller.rb

@@ -27,7 +27,23 @@ class WhowishWordController < ApplicationController
   end
   
   def change_word
-    locale_file = File.join(Rails.root, "config", "locales", "whowish_word", "#{I18n.locale}.yml")
+
+    keys = params[:word_id].split(".")
+    uid = keys.pop
+    filename = "#{I18n.locale}.yml"
+
+    if keys.length > 1
+      filename = "#{keys[1..-1].join("_")}_#{filename}"
+    end
+
+    paths = [Rails.root, "config", "locales", "whowish_word"]
+    paths.push(keys[0]) if keys.length > 0
+    paths.push(filename)
+
+    locale_file = File.join(*paths)
+    FileUtils.mkdir_p(File.join(*paths[0..-2]))
+
+    translation_keys = I18n.normalize_keys(I18n.locale, params[:word_id], nil, ".")
     
     file = nil
     data = {}
@@ -48,8 +64,14 @@ class WhowishWordController < ApplicationController
         data = {}
       end
 
-      data[I18n.locale.to_s] ||= {}
-      data[I18n.locale.to_s][params[:word_id]] = params[:content]
+      direct = data
+      translation_keys[0..-2].each { |k|
+        k = k.to_s
+        direct[k] ||= {}
+        direct = direct[k]
+      }
+
+      direct[translation_keys.last.to_s] = params[:content]
 
       file.rewind
       file.write(YAML.dump(data))
@@ -60,9 +82,13 @@ class WhowishWordController < ApplicationController
       file.close
     end
 
-    I18n.translations[I18n.locale.to_sym] ||= {}
-    I18n.translations[I18n.locale.to_sym][params[:word_id].to_sym] = params[:content]
-    
+    direct = I18n.translations
+    translation_keys[0..-2].each { |k|
+      direct[k] ||= {}
+      direct = direct[k]
+    }
+    direct[translation_keys.last] = params[:content]
+
     render :json=>{
       :ok => true
     }

data/rails/app/controllers/application_controller.rb

@@ -5,7 +5,11 @@ class ApplicationController < ActionController::Base
   before_filter :activate_whowish_word, :set_locale
   
   def activate_whowish_word
-    if params[:edit_mode] == "yes"
+    if params[:edit_mode]
+      session[:edit_mode] = params[:edit_mode]
+    end
+
+    if session[:edit_mode] == "yes"
       whowish_word.activate_edit_mode
     end
   end

data/rails/app/controllers/home_controller.rb

@@ -5,5 +5,4 @@ class HomeController < ApplicationController
   def edit_nested
     render :edit, :layout=>"nested"
   end
-  
 end

data/rails/app/views/home/index.html.erb

@@ -1,24 +1,40 @@
-<%=I18n.locale%>
-<a href="/home?locale=en">en</a><br/>
-<a href="/home?locale=th">th</a><br/>
-<a href="/home?locale=jp">jp</a>
+<h1>
+	This is the test page for
+	<a href="http://www.github.com/tanin47/whowish_word">whowish_word</a>
+</h1>
+<h3>Choose the language</h3>
+<ul class="Menu">
+	<li class="<%='Active' if I18n.locale == :en%>">
+		<a href="/home?locale=en">en</a>
+	</li>
+	<li class="<%='Active' if I18n.locale == :th%>">
+		<a href="/home?locale=th">th</a>
+	</li>
+	<li class="<%='Active' if I18n.locale == :jp%>">
+		<a href="/home?locale=jp">jp</a>
+	</li>
+	<li>
+		<%
+			if @whowish_word_config.edit_mode == true
+		%>
+				<a href="/home?edit_mode=no" style="font-weight: bold;color: green;">Edit-Mode: ON</a>
+		<%
+			else
+		%>
+				<a href="/home?edit_mode=yes" style="font-weight: bold;color: red;">Edit-Mode: OFF</a>
+		<%
+			end
+		%>
+	</li>
+</ul>
+
 <form autocomplete="off" onsubmit="return false;">
 	<div>
 		<span style="width:600px;">
 			<p>This is the page that tests every element.</p>
 		</span>
 		<span>
-			<%
-				if @whowish_word_config.edit_mode == true
-			%>
-					<a href="/home">Dectivate edit mode</a>
-			<%
-				else
-			%>
-					<a href="/home?edit_mode=yes">Activate edit mode</a>
-			<%
-				end
-			%>
+
 		</span>
 		<span>
 			<b>Text: </b> <%=t :text%>

data/rails/app/views/home2/index.html.erb

@@ -1,4 +1,2 @@
-<%=t :hello, :name => "Tanin" %><br/>
-<%=t :test%>
-<input type="text" name="<%=Time.now.to_i%>" value="<%=ta :test_attribute%>">
-<%=t :test_again%>
+This is a global text <strong><%=t :hello%></strong><br/>
+This is a local text <strong><%=t '.test'%></strong>

data/rails/app/views/home2/test.html.erb

@@ -0,0 +1,3 @@
+<h1>Another test page</h1><br/>
+This is a global text <strong><%=t :hello%></strong><br/>
+This is a local text <strong><%=t '.test'%></strong>

data/rails/config/locales/whowish_word/en.yml

@@ -1,4 +1,3 @@
 ---
 en:
-  text1: '456'
-  text: '123'
+  hello: Hello123

data/rails/config/locales/whowish_word/home2/index_en.yml

@@ -0,0 +1,5 @@
+---
+en:
+  home2:
+    index:
+      test: Test123

data/rails/config/locales/whowish_word/home2/test_en.yml

@@ -0,0 +1,5 @@
+---
+en:
+  home2:
+    test:
+      test: Another Test

data/rails/public/stylesheets/main.css

@@ -5,6 +5,28 @@ body, input, textarea, button, select, option, div, span {
 	line-height: 30px;
 }
 
+.Menu {
+	padding: 0px;
+	margin: 0px;
+	list-style: none;
+}
+
+.Menu > li {
+	display: inline-block;
+	padding: 10px;
+	margin: 0px;
+}
+
+.Menu > li.Active {
+	border: 1px solid #CCC;
+	background-color: #EFEFEF;
+}
+
+.Menu > li.Active > a {
+	font-weight: bold;
+	text-decoration: none;
+}
+
 body > form > div {
 	display:block;
 	margin-left:25px;

data/whowish_word.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "whowish_word"
-  s.version     = "0.4.0"
+  s.version     = "0.5.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tanin Na Nakorn"]
   s.email       = ["tanin47@yahoo.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whowish_word
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies: []
 description: Inline internationlization for Rails 3.2.*
 email:
@@ -92,6 +92,7 @@ files:
 - rails/app/views/home/static_edit.html.erb
 - rails/app/views/home/static_edit_select.html.erb
 - rails/app/views/home2/index.html.erb
+- rails/app/views/home2/test.html.erb
 - rails/app/views/integration/attr.html.erb
 - rails/app/views/integration/index.html.erb
 - rails/app/views/integration/select.html.erb
@@ -113,6 +114,8 @@ files:
 - rails/config/environment.rb
 - rails/config/initializers/whowish_word.rb
 - rails/config/locales/whowish_word/en.yml
+- rails/config/locales/whowish_word/home2/index_en.yml
+- rails/config/locales/whowish_word/home2/test_en.yml
 - rails/config/locales/whowish_word/jp.yml
 - rails/config/locales/whowish_word/th.yml
 - rails/config/mongoid.rb