RubyGems - tr8n - Versions diffs - 3.0.5 → 3.1.1 - Mend

tr8n 3.0.5 → 3.1.1

Files changed (690) hide show

data/app/models/tr8n/translation_key_comment_filter.rb CHANGED Viewed

@@ -24,7 +24,7 @@
 class Tr8n::TranslationKeyCommentFilter < Tr8n::BaseFilter
   def inner_joins
-    [["Tr8n::Language", :language_id], ["Tr8n::TranslationKey", :translation_key_id], ["Tr8n::Translator", :translator_id]]
+    [:language, :translation_key, :translator]
   end
 end

data/app/models/tr8n/translation_key_lock_filter.rb CHANGED Viewed

@@ -24,7 +24,7 @@
 class Tr8n::TranslationKeyLockFilter < Tr8n::BaseFilter
   def inner_joins
-    [["Tr8n::Language", :language_id], ["Tr8n::TranslationKey", :translation_key_id], ["Tr8n::Translator", :translator_id]]
+    [:language, :translation_key, :translator]
   end
 end

data/app/models/tr8n/translation_key_source_filter.rb CHANGED Viewed

@@ -24,7 +24,7 @@
 class Tr8n::TranslationKeySourceFilter < Tr8n::BaseFilter
   def inner_joins
-    [["Tr8n::TranslationKey", :translation_key_id], ["Tr8n::TranslationSource", :translation_source_id]]
+    [:translation_key, :translation_source]
   end
 end

data/app/models/tr8n/translation_source_filter.rb CHANGED Viewed

@@ -24,7 +24,7 @@
 class Tr8n::TranslationSourceFilter < Tr8n::BaseFilter
   def inner_joins
-    [["Tr8n::TranslationDomain", :translation_domain_id]]
+    [:translation_domain]
   end
 end

data/app/models/tr8n/translation_vote_filter.rb CHANGED Viewed

@@ -23,12 +23,12 @@
 class Tr8n::TranslationVoteFilter < Tr8n::BaseFilter
-  def inner_joins
-    [["Tr8n::Translation", :translation_id], ["Tr8n::Translator", :translator_id]]
-  end
   def default_filter_if_empty
     "created_today"
   end
+  def inner_joins
+    [:translation, :translator]
+  end
 end

data/app/models/tr8n/translator_filter.rb CHANGED Viewed

@@ -43,4 +43,8 @@ class Tr8n::TranslatorFilter < Tr8n::BaseFilter
     "created_today"
   end
+  def inner_joins
+    [:user]
+  end
 end

data/app/models/tr8n/translator_following_filter.rb CHANGED Viewed

@@ -23,12 +23,12 @@
 class Tr8n::TranslatorFollowingFilter < Tr8n::BaseFilter
-  def inner_joins
-    [["Tr8n::Translator", :translator_id]]
-  end
   def default_filter_if_empty
     "created_today"
   end
+  def inner_joins
+    [:translator]
+  end
 end

data/app/models/tr8n/translator_log_filter.rb CHANGED Viewed

@@ -23,10 +23,6 @@
 class Tr8n::TranslatorLogFilter < Tr8n::BaseFilter
-  def inner_joins
-    [["Tr8n::Translator", :translator_id]]
-  end
   def definition
     defs = super
     defs[:action][:is] = :list
@@ -46,4 +42,8 @@ class Tr8n::TranslatorLogFilter < Tr8n::BaseFilter
     "created_today"
   end
+  def inner_joins
+    [:translator]
+  end
 end

data/app/models/tr8n/translator_metric_filter.rb CHANGED Viewed

@@ -23,10 +23,6 @@
 class Tr8n::TranslatorMetricFilter < Tr8n::BaseFilter
-  def inner_joins
-    [["Tr8n::Language", :language_id], ["Tr8n::Translator", :translator_id]]
-  end
   def default_order
     'updated_at'
   end
@@ -35,4 +31,8 @@ class Tr8n::TranslatorMetricFilter < Tr8n::BaseFilter
     "updated_today"
   end
+  def inner_joins
+    [:language, :translator]
+  end
 end

data/app/models/tr8n/translator_report_filter.rb CHANGED Viewed

@@ -24,7 +24,7 @@
 class Tr8n::TranslatorReportFilter < Tr8n::BaseFilter
   def inner_joins
-    [["Tr8n::Translator", :translator_id]]
+    [:translator]
   end
 end

data/app/views/layouts/tr8n/application.html.erb ADDED Viewed

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Tr8n</title>
+  <%= stylesheet_link_tag    "tr8n/application" %>
+  <%= javascript_include_tag "tr8n/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+<%= yield %>
+</body>
+</html>

data/app/views/tr8n/admin/clientsdk/lb_samples.html.erb CHANGED Viewed

@@ -11,45 +11,47 @@
     {:label => "Some [bold: decoration] stuff!", :tokens => "{'bold': '<strong>{$0}</strong>'}", :alt => "Uses decoration token."},
     {:label => "Using default [bold: decorations]!", :tokens => "", :alt => "Uses decoration token with a fallback default decoration."},
     {:label => "More default [italic: decorations]!", :tokens => "", :alt => "Uses decoration token with a fallback default decoration."},
-    {:label => "Even more [span: default decorations]!", :tokens => "{span: {style:'font-size:18px;font-weight:bold;color:blue;'}}", :alt => "Uses decoration token with a fallback default decoration."},
     {:label => "[link: Click here] is a link default decoration!", :tokens => "{'link':{'href':'http://www.google.com'}}", :alt => "Uses decoration token with a fallback default decoration."},
     {:label => "You have [link: {count|| message, messages}] in your mailbox!", :tokens => "{'link':{'href':'http://www.google.com'}, 'count': 5}", :alt => "Uses decoration and data tokens together."},
   ]
 %>
-<div style='padding-top:5px; padding-bottom:5px; font-size: 18px;'>
-  <span style="font-size:12px; color:grey; float:right; padding-top:5px;">
-    Click on the example to use it in the test tool.
-  </span>
+<div class="inner">
+	<div class="hd">
+		<span style="float:right;">
+		<%=link_to_function(image_tag("tr8n/close.gif"), "tr8nLightbox.hide();")%>
+		</span>
+		Tr8n Client SDK JavaScript Examples
+	</div>
-	Tr8n Client SDK JavaScript Examples
-</div>
+	<div class="bd">
+		<div style="font-size:12px; color:grey; padding-bottom:5px;">
+			Click on the example to use it in the test tool.
+		</div>
-<%= form_tag("", :class => "tr8n") do %>
-	<div style="height:400px; overflow:auto;">
-		<table class="admin_table">
-			<tr>
+		<%= form_tag("", :class => "tr8n") do %>
+			<div style="height:350px; overflow:auto;">
+			<table class="admin_table">
+				<tr>
 				<th>Label</th>
 				<th>Tokens</th>
-			</tr>
-			<% examples.each_with_index do |ex, index| %>
-				<tr style='cursor:pointer;' onClick="useExample(<%=index%>)" title="<%=ex[:alt]%>">
-					<td>
+				</tr>
+				<% examples.each_with_index do |ex, index| %>
+					<tr style='cursor:pointer;' onClick="useExample(<%=index%>)" title="<%=ex[:alt]%>">
+						<td>
 						<%=hidden_field_tag("tr8n_example_label_#{index}", ex[:label]) %>
 						<%=h(ex[:label])%>
-					</td>
-					<td>
-            <%=hidden_field_tag("tr8n_example_tokens_#{index}", ex[:tokens]) %>
+						</td>
+						<td>
+						<%=hidden_field_tag("tr8n_example_tokens_#{index}", ex[:tokens]) %>
 						<%=h(ex[:tokens])%>
-					</td>
-				</tr>
-			<% end %>
-		</table>
-	</div>
-<% end %>
+						</td>
+					</tr>
+				<% end %>
-<div style="text-align:center;padding-top:10px;">
-   <%=tr8n_button_tag(trl("Close", "Tr8n lightbox close button"), "tr8nLightbox.hide();") %>
-</div>
+			</table>
+			</div>
+		<% end %>
+	</div>
+</div>

data/app/views/tr8n/admin/common/_lightbox_buttons.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-<div style="text-align:center;padding-top:10px;">
+<div style="text-align:center;padding-top:5px;">
    <%=link_to_function("<span>#{trl("Save", "Tr8n lightbox save button")}</span>".html_safe, "Tr8n.Effects.submit('tr8n_form');", :class => "tr8n_grey_button tr8n_pcb") %>
 	  <%=trl('or')%>
    <%=link_to_function(trl("close", "Tr8n lightbox close button"), "tr8nLightbox.hide()", :class => "tr8n_cancel_link") %>

data/app/views/tr8n/admin/domain/index.html.erb CHANGED Viewed

@@ -17,7 +17,7 @@
   ]) %>
 <% end %>
-<%= will_filter_actions_bar_tag(@keys, [
+<%= will_filter_actions_bar_tag(@domains, [
   ['Delete Selected Domains', 'deleteSelectedDomains()']
 ]) %>

data/app/views/tr8n/admin/domain/{key_sources.rhtml → key_sources.html.erb} RENAMED Viewed

@@ -37,7 +37,7 @@
   ]) %>
 <% end %>
-<%= will_filter_actions_bar_tag(@keys, [
+<%= will_filter_actions_bar_tag(@key_sources, [
   ['Delete Selected Key Sources', 'deleteSelectedKeySources()']
 ]) %>

data/app/views/tr8n/admin/domain/lb_caller.html.erb CHANGED Viewed

@@ -1,35 +1,39 @@
-<h2>Translation Key Caller</h2>
-<table class="admin_table">
-    <tr>
-        <th>
-            Label:
-        </th>
-        <td>
-            <%=@key_source.key.label%>
-        </td>
-    </tr>
-    <tr>
-        <th valign="top">
-            Description:
-        </th>
-        <td>
-            <%=@key_source.key.description%>
-        </td>
-    </tr>
-    <tr>
-        <th>
-            Source:
-        </th>
-        <td>
-            <%=@key_source.source.source%>
-        </td>
-    </tr>
-</table>
-<div style="height:400px; overflow:auto;">
-	<%=@caller.join("<br>")%>
-</div>
-<div style="text-align:center;padding-top:10px; font-size:10px;">
-   <%=link_to_function("<span>close</span>", "tr8nLightbox.hide()", :class => "tr8n_grey_button tr8n_pcb") %>
-</div>
+<div class="inner">
+    <div class="hd">
+        <div style="float:right;">
+            <%=link_to_function(image_tag("tr8n/close.gif"), "tr8nLightbox.hide();") %>
+        </div>
+        Translation Key Caller
+    </div>
+    <div class="bd">
+        <table class="admin_table">
+            <tr>
+                <th>
+                    Label:
+                </th>
+                <td>
+                    <%=@key_source.key.label %>
+                </td>
+            </tr>
+            <tr>
+                <th valign="top">
+                    Description:
+                </th>
+                <td>
+                    <%=@key_source.key.description %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    Source:
+                </th>
+                <td>
+                    <%=@key_source.source.source %>
+                </td>
+            </tr>
+        </table>
+        <div style="height:400px; overflow:auto;">
+            <%=@caller.join("<br>") %>
+        </div>
+    </div>
+</div>

data/app/views/tr8n/admin/domain/sources.html.erb CHANGED Viewed

@@ -19,7 +19,7 @@
   ]) %>
 <% end %>
-<%= will_filter_actions_bar_tag(@keys, [
+<%= will_filter_actions_bar_tag(@sources, [
   ['Delete Selected Sources', 'deleteSelectedSources()']
 ]) %>

data/app/views/tr8n/admin/glossary/lb_update.html.erb CHANGED Viewed

@@ -1,26 +1,33 @@
-<%= form_for(@glossary, :as => :glossary, :url => {:action => :update}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
-  <%= form.hidden_field :id %>
-  <%= hidden_field_tag :source_url, request.env['HTTP_REFERER'] %>
-  <h2>Glossary Term Details</h2>
-  <table class="admin_table">
-      <tr>
-          <th>
-              Keyword:
-          </th>
-          <td>
-              <%= form.text_field :keyword, :style=>"width:100%;" %>
-          </td>
-      </tr>
-      <tr>
-          <th valign="top">
-              Description:
-          </th>
-          <td>
-              <%= form.text_area :description, :style=>"width:100%; height:300px;" %>
-          </td>
-      </tr>
-  </table>
-  <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
-<% end %>
+<div class="inner">
+    <div class="hd">
+        <div style="float:right;"><%=link_to_function(image_tag("tr8n/close.gif"), "tr8nLightbox.hide();") %></div>
+        Glossary Term Details
+    </div>
+    <div class="bd">
+        <%= form_for(@glossary, :as => :glossary, :url => {:action => :update}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
+        <%= form.hidden_field :id %>
+        <%= hidden_field_tag :source_url, request.env['HTTP_REFERER'] %>
+        <table class="admin_table">
+            <tr>
+                <th>
+                    Keyword:
+                </th>
+                <td>
+                    <%= form.text_field :keyword, :style=>"width:99%;" %>
+                </td>
+            </tr>
+            <tr>
+                <th valign="top">
+                    Description:
+                </th>
+                <td>
+                    <%= form.text_area :description, :style=>"width:99%; height:250px;" %>
+                </td>
+            </tr>
+        </table>
+        <% end %>
+    </div>
+		<div class="ft">
+      <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
+		</div>
+</div>

data/app/views/tr8n/admin/language/index.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
 <%= tr8n_will_filter(@languages) %>
-<%=link_to_function("+ Add New Language", "tr8nLightbox.show('/tr8n/admin/language/lb_update', {height:350})")%>
+<%=link_to_function("+ Add New Language", "tr8nLightbox.show('/tr8n/admin/language/lb_update', {height:400})")%>
  |
 <%=link_to_function("Calculate Completeness", 'calculateCompleteness()')%>
 <br>
@@ -11,7 +11,7 @@
 <%= form_tag("", :id => "languages_form") do %>
 	<%= will_filter_table_tag(@languages, :columns => [
     [:checkbox, 'languages'],
-	  [:flag, lambda{|lang| image_tag("/tr8n/images/flags/#{lang.flag}.png")}],
+	  [:flag, lambda{|lang| image_tag("tr8n/flags/#{lang.flag}.png")}],
 	  [:locale, lambda{|lang|
 	    html = []
 	    if lang.enabled?
@@ -56,7 +56,7 @@
 	  }, 'text-align:right;'],
 	  [:actions, lambda{|lang|
 	     html = []
-	     html << link_to_function("Update", "tr8nLightbox.show('/tr8n/admin/language/lb_update?lang_id=#{lang.id}', {height:350})")
+	     html << link_to_function("Update", "tr8nLightbox.show('/tr8n/admin/language/lb_update?lang_id=#{lang.id}', {height:400})")
 	     unless lang.default?
 	      if lang.enabled?
 	        html << link_to("Disable", :action => :disable, :lang_id => lang.id)

data/app/views/tr8n/admin/language/lb_update.html.erb CHANGED Viewed

@@ -1,76 +1,86 @@
-<%= form_for(@language, :as => :language, :url => {:action => :update}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
-  <%= form.hidden_field :id %>
-  <%= hidden_field_tag :source_url, request.env['HTTP_REFERER'] %>
-  <h2>Language Details</h2>
-  <table class="admin_table">
-      <tr>
-          <th>
-              Locale:
-          </th>
-          <td>
-              <%= form.text_field :locale, :style=>"width:100%;" %>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              English Name:
-          </th>
-          <td>
-              <%= form.text_field :english_name, :style=>"width:100%;" %>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              Native Name:
-          </th>
-          <td>
-              <%= form.text_field :native_name, :style=>"width:100%;" %>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              Right to Left:
-          </th>
-          <td>
-              <%= form.check_box :right_to_left, :style=>"width:20px;" %>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              Enabled:
-          </th>
-          <td>
-              <%= form.check_box :enabled, :style=>"width:20px;" %>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              Featured Index:
-          </th>
-          <td>
-              <%= form.text_field :featured_index %>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              Google Key:
-          </th>
-          <td>
-              <%= form.text_field :google_key %>
-          </td>
-      </tr>
-      <tr>
-          <th>
-              Facebook Key:
-          </th>
-          <td>
-              <%= form.text_field :facebook_key %>
-          </td>
-      </tr>
-  </table>
-	<div><i>Note: providing google key/locale will enable google suggestions for that language.</i></div>
-  <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
-<% end %>
+<div class="inner">
+    <div class="hd">
+        <div style="float:right;">
+            <%=link_to_function(image_tag("tr8n/close.gif"), "tr8nLightbox.hide();") %>
+        </div>
+        Language Details
+    </div>
+    <div class="bd">
+				<%= form_for(@language, :as => :language, :url => {:action => :update}, :html => {:id => 'tr8n_form', :method => :post, :class => "tr8n"}) do |form| %>
+        <%= form.hidden_field :id %>
+        <%= hidden_field_tag :source_url, request.env['HTTP_REFERER'] %>
+        <table class="admin_table">
+            <tr>
+                <th>
+                    Locale:
+                </th>
+                <td>
+                    <%= form.text_field :locale, :style=>"width:99%;" %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    English Name:
+                </th>
+                <td>
+                    <%= form.text_field :english_name, :style=>"width:99%;" %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    Native Name:
+                </th>
+                <td>
+                    <%= form.text_field :native_name, :style=>"width:99%;" %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    Right to Left:
+                </th>
+                <td>
+                    <%= form.check_box :right_to_left, :style=>"width:20px;" %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    Enabled:
+                </th>
+                <td>
+                    <%= form.check_box :enabled, :style=>"width:20px;" %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    Featured Index:
+                </th>
+                <td>
+                    <%= form.text_field :featured_index %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    Google Key:
+                </th>
+                <td>
+                    <%= form.text_field :google_key %>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    Facebook Key:
+                </th>
+                <td>
+                    <%= form.text_field :facebook_key %>
+                </td>
+            </tr>
+        </table>
+        <div>
+            <em>Note: providing google key/locale will enable google suggestions for that language.</em>
+        </div>
+        <% end %>
+    </div>
+    <div class="ft">
+        <%= render :partial => "/tr8n/admin/common/lightbox_buttons" %>
+    </div>
+</div>