tr8n 3.1.1 → 3.1.2

data/{app/views/tr8n → local/tr8n_server/app/views}/home/index.html.erb

@@ -40,9 +40,8 @@
 	  <li><%=tr("Follow us on Twitter:")%> <%= link_to("@tr8nrails", "http://twitter.com/tr8nrails") %></li>
 		<li><%=tr("Visit our page on Facebook:")%>  <%= link_to("Tr8n Translation Engine Page", "http://www.facebook.com/pages/Tr8n-Translation-Engine/138407706218622")%></li> 	
   </ul>
-	
-</div>
 
+</div>
 
 
 

data/local/tr8n_server/app/views/kaminari/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="first">
+  <%= link_to_unless current_page.first?, raw(tr('{laquo} First', 'Link to the first page')), url, :remote => remote %>
+</span>

data/local/tr8n_server/app/views/kaminari/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>

data/local/tr8n_server/app/views/kaminari/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="last">
+  <%= link_to_unless current_page.last?, raw(tr('Last {raquo}', 'Link to the last page')), url, {:remote => remote} %>
+</span>

data/local/tr8n_server/app/views/kaminari/_next_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="next">
+  <%= link_to_unless current_page.last?, raw(tr('Next {rsaquo}', 'Link to the next page')), url, :rel => 'next', :remote => remote %>
+</span>

data/local/tr8n_server/app/views/kaminari/_page.html.erb

@@ -0,0 +1,12 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page<%= ' current' if page.current? %>">
+  <%= link_to_unless page.current?, page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</span>

data/local/tr8n_server/app/views/kaminari/_paginator.html.erb

@@ -0,0 +1,23 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <nav class="pagination">
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| -%>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
+  </nav>
+<% end -%>

data/local/tr8n_server/app/views/kaminari/_prev_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="prev">
+  <%= link_to_unless current_page.first?, raw(tr('{lsaquo} Prev', 'Link to the previous page')), url, :rel => 'prev', :remote => remote %>
+</span>

data/{test/dummy → local/tr8n_server}/app/views/layouts/_footer.html.erb

@@ -4,10 +4,10 @@
 	    <li><%=link_to(tr("Languages"), "/tr8n/language/table", :class => "quiet")%></li>
 	    <li><%=link_to(tr("Translator Tools"), "/tr8n/dashboard", :class => "quiet")%></li>
 	    <li><%=link_to(tr("Administration Tools"), "/tr8n/admin/language", :class => "quiet")%></li>
-	    <li><%=link_to(tr("Credits"), "/tr8n/home/credits", :class => "quiet")%></li>
-	    <li><%=link_to(tr("License"), "/tr8n/home/license", :class => "quiet")%></li>
+	    <li><%=link_to(tr("Credits"), "/tr8n/help/credits", :class => "quiet")%></li>
+	    <li><%=link_to(tr("License"), "/tr8n/help/license", :class => "quiet")%></li>
 	  </ul>
-	  &copy; Copyright 2010-2011 Tr8n.net
+	  &copy; Copyright 2010-2011 tr8n.net
 	</div>
 
 </div>

data/{test/dummy → local/tr8n_server}/app/views/layouts/_header.html.erb

@@ -12,7 +12,7 @@
       </ul>
       <h1 class="logo">
 				<%=image_tag("tr8n/tr8n_logo2.png", :style => "width:60px")%>
-				<%=link_to("Tr8n Translation Memory Server", "/tr8n/home", :style=>"text-decorations:none;")%>
+				<%=link_to("Tr8n Translation Memory Server", "/home", :style=>"text-decorations:none;")%>
 			</h1>
     </div>
   </div>

data/local/tr8n_server/app/views/layouts/tr8n.html.erb

@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+		<title><%=trl("Tr8n Engine Plugin", "Application title")%></title>
+		<%= stylesheet_link_tag("tr8n/layout") %>
+		<%= stylesheet_link_tag("tr8n/components") %>
+
+		<%= tr8n_scripts_tag %>
+	</head>
+  <body>
+    <div class="document">
+			<div class="page_head">
+			  <div class="page_fixed">
+			    <div class="mrgn_h">
+			    	<%= tr8n_translator_login_tag(:class => "flt_r horiz_list top_nav") %>
+			      <h1 class="logo"><%=link_to(tr("Tr8n Translation Engine", "Application title"), {:controller => "/tr8n/home"}, :style=>"text-decorations:none;")%></h1>
+			    </div>
+			  </div>
+			</div>
+
+			<div class="page_fixed">
+			    <%= tr8n_flashes_tag %>
+			</div>
+
+      <div class="page_fixed">
+        <div class="page_body">
+          <div class="content_module">
+            <div class="content_inner">
+              <%= yield %>
+            </div>
+          </div>
+        </div>
+				<div class="page_ft module quiet">
+				  <ul class="flt_r right_horiz_list">
+				    <li><%=link_to(tr("Home"), "/tr8n/home", :class => "quiet")%></li>
+				    <li><%=link_to(tr("Languages"), "/tr8n/language/table", :class => "quiet")%></li>
+				    <li><%=link_to(tr("Translator Tools"), "/tr8n/dashboard", :class => "quiet")%></li>
+				    <li><%=link_to(tr("Administration Tools"), "/tr8n/admin/language", :class => "quiet")%></li>
+				    <li><%=link_to(tr("Credits"), "/tr8n/home/credits", :class => "quiet")%></li>
+				    <li><%=link_to(tr("License"), "/tr8n/home/license", :class => "quiet")%></li>
+				  </ul>
+				  &copy; Copyright 2010 - 2011 tr8n.net
+				</div>
+
+				<div style="padding:15px;">
+					<%= tr8n_language_strip_tag %>
+				</div>
+      </div>
+    </div>
+  </body>
+</html>

data/local/tr8n_server/app/views/layouts/tr8n_admin.html.erb

@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+		<title><%=trl("Tr8n Engine Admin Tools", "Application title")%></title>
+		<%= stylesheet_link_tag("tr8n/layout") %>
+		<%= stylesheet_link_tag("tr8n/components") %>
+		<%= tr8n_scripts_tag %>
+		<style>
+			.page_fixed {
+				width:1200px;
+			}
+			.page_body {
+				width:1200px;
+			}
+			 
+			.wf_form {
+				width: 99.8%;
+			} 
+		</style>
+  </head>
+  <body>
+    <div class="document">
+			<div class="page_head">
+			  <div class="page_fixed">
+			    <div class="mrgn_h">
+			    	<%= tr8n_translator_login_tag(:class => "flt_r horiz_list top_nav") %>
+			      <h1 class="logo"><%=link_to(tr("Tr8n Translation Engine", "Application title"), {:controller => "/tr8n/home"}, :style=>"text-decorations:none;")%></h1>
+			    </div>
+			  </div>
+			</div>
+
+			<div class="page_fixed">
+			    <%= tr8n_flashes_tag %>
+			</div>
+      <div class="page_fixed">
+        <div class="page_body">
+          <div class="content_module">
+            <div class="content_inner">
+              <%= yield %>
+            </div>
+          </div>
+        </div>
+				<div class="page_ft module quiet">
+				  <ul class="flt_r right_horiz_list">
+				    <li><%=link_to(tr("Home"), "/tr8n/home", :class => "quiet")%></li>
+				    <li><%=link_to(tr("Languages"), "/tr8n/language/table", :class => "quiet")%></li>
+				    <li><%=link_to(tr("Translator Tools"), "/tr8n/dashboard", :class => "quiet")%></li>
+				    <li><%=link_to(tr("Administration Tools"), "/tr8n/admin/language", :class => "quiet")%></li>
+				    <li><%=link_to(tr("Credits"), "/tr8n/home/credits", :class => "quiet")%></li>
+				    <li><%=link_to(tr("License"), "/tr8n/home/license", :class => "quiet")%></li>
+				  </ul>
+				  &copy; Copyright 2010 - 2011 tr8n.net
+				</div>
+
+				<div style="padding:15px;">
+					<%= tr8n_language_strip_tag %>
+				</div>
+      </div>
+    </div>
+  </body>
+</html>

data/{test/dummy → local/tr8n_server}/app/views/login/register.html.erb

@@ -16,6 +16,12 @@
         <%=password_field_tag :password, "", :class => "xlong_input h4"%> &nbsp; *
       </div>
     </div>
+    <div class="field">
+      <div class="strong field_hd txt_r h4"><%=tr('Confirm Password:') %></div>
+      <div class="field_bd">
+        <%=password_field_tag :password_confirm, "", :class => "xlong_input h4"%> &nbsp; *
+      </div>
+    </div>
     <div class="field">
       <div class="strong field_hd txt_r h4"><%=tr('First Name:') %></div>
       <div class="field_bd">
@@ -33,19 +39,8 @@
       <div class="strong" style="padding-top:8px;">
         &nbsp; <%=radio_button_tag(:gender, "male", params[:gender] == 'male')%> <%=tr('Male', 'Gender') %>
         &nbsp; <%=radio_button_tag(:gender, "male", params[:gender] == 'female')%> <%=tr('Female', 'Gender') %>
-        &nbsp; <%=radio_button_tag(:gender, "unknown", params[:gender] == 'unknown')%> <%=tr('Unknown', 'Gender') %>
-      </div>
-    </div>
-    <div class="field">
-      <div class="strong field_hd txt_r h4"><%=tr('Photo Url:') %></div>
-      <div class="field_bd">
-        <%=text_field_tag :mugshot, params[:mugshot], :class => "xlong_input h4" %>
-      </div>
-    </div>
-    <div class="field">
-      <div class="strong field_hd txt_r h4"><%=tr('Link Url:') %></div>
-      <div class="field_bd">
-        <%=text_field_tag :link, params[:link], :class => "xlong_input h4" %>
+				
+				<span style="color:#888; padding-left:10px; font-size:10px;"><%=tr("Used for gender based translations") %></span>	
       </div>
     </div>
     <br>

data/{test/dummy → local/tr8n_server}/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-run Dummy::Application
+run Tr8nServer::Application

data/{test/dummy → local/tr8n_server}/config/application.rb

@@ -3,11 +3,12 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
+
 require "tr8n"
 require "will_filter"
 require "kaminari"
 
-module Dummy
+module Tr8nServer
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

data/{test/dummy → local/tr8n_server}/config/environment.rb

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-Dummy::Application.initialize!
+Tr8nServer::Application.initialize!

data/{test/dummy → local/tr8n_server}/config/environments/development.rb

@@ -1,4 +1,6 @@
-Dummy::Application.configure do
+require "pry"
+
+Tr8nServer::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on

data/{test/dummy → local/tr8n_server}/config/environments/production.rb

@@ -1,4 +1,4 @@
-Dummy::Application.configure do
+Tr8nServer::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # Code is not reloaded between requests

data/{test/dummy → local/tr8n_server}/config/environments/test.rb

@@ -1,4 +1,4 @@
-Dummy::Application.configure do
+Tr8nServer::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's

data/{test/dummy → local/tr8n_server}/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'a5a170604e8179c5b3806c6dd87ee004b8c3f55d25ecc0d267b1434959feefc075e38af811e4e467cf9715a8b66b3cb16bbbeb6dc985981658cfac5fafebda81'
+Tr8nServer::Application.config.secret_token = 'a5a170604e8179c5b3806c6dd87ee004b8c3f55d25ecc0d267b1434959feefc075e38af811e4e467cf9715a8b66b3cb16bbbeb6dc985981658cfac5fafebda81'

data/{test/dummy → local/tr8n_server}/config/initializers/session_store.rb

@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+Tr8nServer::Application.config.session_store :cookie_store, key: '_tr8n_server_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rails generate session_migration")
-# Dummy::Application.config.session_store :active_record_store
+# Tr8nServer::Application.config.session_store :active_record_store

data/{test/dummy → local/tr8n_server}/config/routes.rb

@@ -1,8 +1,8 @@
-Dummy::Application.routes.draw do
+Tr8nServer::Application.routes.draw do
   mount Tr8n::Engine => "/tr8n"
   mount WillFilter::Engine => "/will_filter"
 
-  root :to => "tr8n/home#index"
+  root :to => "home#index"
 
   [:admins, :users].each do |ctrl|
     match "/admin/#{ctrl}(/:action)", :controller => "admin/#{ctrl}"

data/{test/dummy → local/tr8n_server}/config/tr8n/config.yml

@@ -63,11 +63,15 @@ defaults: &defaults
   #
   # For example: 
   #  
-  # cache_adapter:  ActiveSupport::Cache
-  # cache_store:    memory_store
-  # cache_store:    file_store
-  # cache_store:    drb_store
-  # cache_store:    [mem_cache_store, 'localhost:11211']
+  # adapter:  ActiveSupport::Cache
+  # store:    memory_store        # only for dev or test - single instance
+  # store:    file_store          # only for dev or test - single instance
+  # store:    drb_store
+  # store:    [mem_cache_store, 'localhost:11211'] # recommended
+  # 
+  # If you choose to use memcached, don't forget to add the gem to your Gemfile:
+  #
+  # gem 'memcache-client'
   #
   # You can also provide your own implementation of the adapter:
   #
@@ -77,7 +81,7 @@ defaults: &defaults
   caching:
     enabled:                  false
     adapter:                  ActiveSupport::Cache
-    store:                    [mem_cache_store, 'localhost:11211']
+    store:                    ['mem_cache_store', 'localhost:11211']
     version:                  1 # you can change the version to invalidate the cache
 
   #############################################################################
@@ -94,9 +98,9 @@ defaults: &defaults
   #############################################################################
   site_info:  
     title:                    "Tr8n"                            # site title - provide your site title here
-    contact_email:            "michael@tr8n.net"                # contact email for questions about translations
+    contact_email:            "support@tr8n.net"                # contact email for questions about translations
     current_locale_method:    "current_locale"                  # application controller method that sets and returns current locale
-    default_url:              "/tr8n/home"                      # default site url where to redirect the user if Tr8n is disabled            
+    default_url:              "/home"                           # default site url where to redirect the user if Tr8n is disabled            
     default_locale:           "en-US"                           # locale of the site default language
     sitemap_path:             "/config/tr8n/site/sitemap.json"  # location of the sitemap definition file
     splash_screen:            "/tr8n/common/splash_screen"      # location of the Tr8n splash screen  
@@ -133,7 +137,7 @@ defaults: &defaults
       token_suffixes:         [count, num, age, hours, minutes, years, seconds]
       object_method:          to_i
     gender_rule:  
-      token_suffixes:         [user, profile, actor, target, partner, parent, child, sibling, manager]
+      token_suffixes:         [user, profile, actor, target]
       object_method:          gender
       method_values:  
         female:               female
@@ -198,8 +202,10 @@ defaults: &defaults
     regular:                  0
     trusted:                  50
     professional:             100
-    manager:                  1000   # reserved for translation tools
-    admin:                    10000  # reserved for admin tools
+    manager:                  1000      # reserved for translation tools
+    admin:                    10000     # reserved for admin tools
+    application:              100000    # reserved for applications
+    system:                   1000000   # reserved for system
   
   default_translation_key_level: 0
   #############################################################################
@@ -222,6 +228,29 @@ defaults: &defaults
       monthname_abbr_year:    '%b %d, %Y'           # Jul 4, 2008
       date_time:              '%m/%d/%Y at %H:%M'   # 01/03/1010 at 5:30
  
+  #############################################################################
+  # You can synchronize your translation keys and translations with other 
+  # sites that use Tr8n. This way you can get your site translated by 
+  # millions of users from around the internet. Visit the following url and 
+  # register as a developer, register your application and copy your app key
+  # in the line below:
+  #
+  #  http://tr8n.net
+  # 
+  # To sychronize your translations run the following command: 
+  # 
+  #  rake tr8n:sync
+  #
+  # You can run this command as often as your account on tr8n.net permits you.
+  #############################################################################
+  synchronization:
+    server:                   "http://tr8n.net"  # alternative, regional locations will be available in the future
+    key:                      "iKjOrZjor68a4UeCD3Cq2r9t9ibBC4HnYoMNMrN7" # replace this with your key
+    secret:                   "iKjOrZjor68a4UeCD3Cq2r9t9ibBC4HnYoMNMrN7" # replace this with your secret   
+    batch_size:               50     # how many kesy to send to the server at a time
+    create_rules:             true   # force rules creation, or skip translations for rules that don't exist
+    all_languages:            false  # use only enabled languages, or all languages
+
 #############################################################################
 # Environment Settings
 # You can overload any feature defined in the defaults for any environment