tr8n 3.1.1 → 3.1.2

data/app/views/tr8n/language_cases/index.html.erb

@@ -19,7 +19,7 @@
 	</div>
 	
 	<div style="margin-top:10px; margin-bottom:10px; border: 1px dotted #ccc; padding:10px;">
-	  <%= render :partial => "/tr8n/common/paginator", :locals => {:objects => @maps, :subject => 'case map'} %>
+		<%= tr8n_paginator_tag(@maps, :subject => 'case map') %>	
 	  
 		<table>
 			<tr style="border-bottom:1px solid #ccc;">
@@ -46,7 +46,7 @@
 			
 		</table>
 	
-	  <%= render :partial => "/tr8n/common/paginator", :locals => {:objects => @maps, :subject => 'case map'} %>
+		<%= tr8n_paginator_tag(@maps, :subject => 'case map') %>	
 	</div>
 	
 	<%= render :partial => "/tr8n/common/footer" %>

data/app/views/tr8n/phrases/_comments_module.html.erb

@@ -8,7 +8,7 @@
 	<div class="section" id="comments_content">
 		<div style="margin-bottom:10px;">
 			<% if @comments.any? %>
-				<%=tr8n_paginator_tag(@comments, "comment")%>
+				<%=tr8n_paginator_tag(@comments, :subject => "comment")%>
 			
 			  <table style="width:100%; ">
 			    <% @comments.each do |comment| %>

data/app/views/tr8n/phrases/index.html.erb

@@ -27,9 +27,7 @@
 	</div>
 	
 	<div class="section">
-    <% if @translation_keys.any? %>
-			<%= tr8n_paginator_tag(@translation_keys, 'phrase') %>	
-    <% end %>
+  	<%= tr8n_paginator_tag(@translation_keys, :subject => 'phrase') if @translation_keys.any? %>	
 	
 	  <table style="width:100%">
 	    <tr style="border-bottom:2px solid #ccc;">
@@ -72,9 +70,7 @@
 		    <div style="text-align:left; padding-top:10px; font-size:12px;"><%=trla("No phrases found")%></div>
 		<% end %>
 		
-		<% if @translation_keys.any? %>
-	    <%= render :partial => "/tr8n/common/paginator", :locals => {:objects => @translation_keys, :subject => 'phrase'} %>
-		<% end %>
+  	<%= tr8n_paginator_tag(@translation_keys, :subject => 'phrase') if @translation_keys.any? %>	
 	</div>
 	<%= render :partial => "/tr8n/common/footer" %>
 	

data/app/views/tr8n/translations/_list.html.erb

@@ -1,6 +1,4 @@
-<% if mode == :list and translations.any? %>
-  <%= render :partial => "/tr8n/common/paginator", :locals => {:objects => translations, :subject => 'translation'} %>
-<% end %>	
+<%= tr8n_paginator_tag(translations, :subject => 'translation') if mode == :list and translations.any? %>	
 
 <table style="width:100%;" cellpadding="5px" cellspacing="3px">
   <tr style="border-bottom:1px solid #ccc;">
@@ -25,9 +23,7 @@
     <div style="text-align:left; padding-top:10px; font-size:12px;"><%=trla("No translations found")%></div>
 <% end %>
 
-<% if mode == :list and translations.any? %>
-  <%= render :partial => "/tr8n/common/paginator", :locals => {:objects => translations, :subject => 'translation'} %>
-<% end %>	
+<%= tr8n_paginator_tag(translations, :subject => 'translation') if mode == :list and translations.any? %>	
 
 <% if [:edit, :view].include?(mode) %>
 	<script>

data/config/routes.rb

@@ -23,7 +23,7 @@
 
 Tr8n::Engine.routes.draw do
   [:awards, :chart, :dashboard, :forum, :glossary, :help, :language_cases,
-   :language, :phrases, :translations, :translator, :home, :login].each do |ctrl|
+   :language, :phrases, :translations, :translator].each do |ctrl|
     match "#{ctrl}(/:action)", :controller => "#{ctrl}"
   end
   
@@ -37,7 +37,7 @@ Tr8n::Engine.routes.draw do
   end
   
   namespace :tr8n do
-    root :to => "home#index"
+    root :to => "dashboard#index"
     namespace :admin do
       root :to => "language#index"
     end

data/config/tr8n/config.yml

@@ -7,6 +7,12 @@
 # environment settings at the bottom of the file. 
 #
 # Alternatively, you can overload any of the methods of Tr8n::Config
+#
+# If you would like to manage the configurations on the live site, 
+# try out the Registry gem, located here:
+#
+# http://www.github.com/berk/registry
+#
 #############################################################################
 
 defaults: &defaults
@@ -63,11 +69,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:
   #
@@ -76,7 +86,7 @@ defaults: &defaults
   #############################################################################
   caching:
     enabled:                  false
-    adapter:                  "ActiveSupport::Cache"
+    adapter:                  ActiveSupport::Cache
     store:                    ['mem_cache_store', 'localhost:11211']
     version:                  1 # you can change the version to invalidate the cache
 
@@ -96,13 +106,13 @@ defaults: &defaults
     title:                    "Tr8n"                            # site title - provide your site title here
     contact_email:            "admin@tr8n.org"                  # 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:              "/"                               # 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  
-    tr8n_layout:              "tr8n"                            # layout for the tr8n pages
+    tr8n_layout:              "tr8n"                            # layout for the tr8n pages - change it to your layout
     tr8n_helpers:             []                                # if you need to add extra helpers
-    admin_layout:             "tr8n_admin"                      # layout to be used for the admin user interface
+    admin_layout:             "tr8n_admin"                      # layout to be used for the admin user interface - change it to your layout
     admin_helpers:            []                                # if you need to add extra helpers
     before_filters:           []                                # filters from application controller
     skip_before_filters:      []                                # filters from application controller
@@ -115,8 +125,8 @@ defaults: &defaults
         id:                   "id"
         name:                 "name"                            
         gender:               "gender"
-        admin:                "admin?"
-        guest:                "guest?"
+        admin:                "admin?"            
+        guest:                "guest?"                          # if current_user is nil, the user is automatically a guest
         mugshot:              "mugshot"
         link:                 "link"
         locale:               "locale"
@@ -198,8 +208,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 +234,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 the 
+  # tr8n.net service. 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
+  # and secret in the lines 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

data/config/tr8n/rules/default_language_cases.yml

@@ -0,0 +1,272 @@
+#############################################################################
+#
+# Tr8n Default Language Cases
+#
+#############################################################################
+
+en-US:
+  nom:
+    keyword:                  "nom"
+    latin_name:               "Nominative"
+    native_name:              "Nominative" 
+    description:              "Used for any noun or pronoun that is the  subject of a verb"
+    application:              "phrase"
+  obj:
+    keyword:                  "obj"
+    latin_name:               "Objective"
+    native_name:              "Objective" 
+    description:              "Used in the direct object, indirect object, object of preposition, object complement, and subject of an infinitive"
+    application:              "phrase"
+  pos:
+    keyword:                  "pos"
+    latin_name:               "Possessive"
+    native_name:              "Possessive" 
+    description:              "Used to indicate possession (i.e., ownership). It is usually created by adding 's to the word"
+    application:              "phrase"
+    rules:
+      1:
+        multipart:            false 
+        gender:               none
+        part1:                ends_in
+        value1:               "s"
+        operation:            append
+        operation_value:      "'"
+      2:
+        multipart:            false 
+        gender:               none
+        part1:                does_not_end_in
+        value1:               "s"
+        operation:            append
+        operation_value:      "'s"
+  ord:
+    keyword:                  "ord"
+    latin_name:               "Ordinal"
+    native_name:              "Ordinal" 
+    description:              "The adjective form of the cardinal numbers"
+    application:              "phrase"
+    rules:                    
+      1:
+        multipart:            true 
+        gender:               none
+        part1:                ends_in
+        value1:               "1"
+        operator:             and
+        part2:                does_not_end_in
+        value2:               "11"
+        operation:            append
+        operation_value:      "st"
+      2:
+        multipart:            true 
+        gender:               none
+        part1:                ends_in
+        value1:               "2"
+        operator:             and
+        part2:                does_not_end_in
+        value2:               "12"
+        operation:            append
+        operation_value:      "nd"
+      3:
+        multipart:            true 
+        gender:               none
+        part1:                ends_in
+        value1:               "3"
+        operator:             and
+        part2:                does_not_end_in
+        value2:               "13"
+        operation:            append
+        operation_value:      "rd"
+      4:
+        multipart:            false 
+        gender:               none
+        part1:                ends_in
+        value1:               "0,4,5,6,7,8,9,11,12,13"
+        operation:            append
+        operation_value:      "th"
+  times:
+    keyword:                  "times"
+    latin_name:               "Iteration"
+    native_name:              "Iteration" 
+    description:              "The iteration form of the cardinal numbers"
+    application:              "phrase"
+    rules:                    
+      1:
+        multipart:            true 
+        gender:               none
+        part1:                is
+        value1:               "1"
+        operation:            replace
+        operation_value:      "once"
+      2:
+        multipart:            true 
+        gender:               none
+        part1:                is
+        value1:               "2"
+        operation:            replace
+        operation_value:      "twice"
+      3:
+        multipart:            true 
+        gender:               none
+        part1:                is
+        value1:               "3"
+        operation:            replace
+        operation_value:      "thrice"
+      3:
+        multipart:            false 
+        gender:               none
+        part1:                is_not
+        value1:               "1,2,3"
+        operation:            append
+        operation_value:      " times"
+  ordinal:
+    keyword:                  "ordinal"
+    latin_name:               "Ordinal"
+    native_name:              "Ordinal" 
+    description:              "The adjective form of the cardinal numbers"
+    application:              "phrase"
+    rules:                    
+      1:
+        multipart:            true 
+        gender:               none
+        part1:                is
+        value1:               "1"
+        operation:            replace
+        operation_value:      "first"
+      2:
+        multipart:            true 
+        gender:               none
+        part1:                is
+        value1:               "2"
+        operation:            replace
+        operation_value:      "second"
+      3:
+        multipart:            true 
+        gender:               none
+        part1:                is
+        value1:               "3"
+        operation:            replace
+        operation_value:      "third"
+      4:
+        multipart:            true 
+        gender:               none
+        part1:                ends_in
+        value1:               "1"
+        operator:             and
+        part2:                does_not_end_in
+        value2:               "11"
+        operation:            append
+        operation_value:      "st"
+      5:
+        multipart:            true 
+        gender:               none
+        part1:                ends_in
+        value1:               "2"
+        operator:             and
+        part2:                does_not_end_in
+        value2:               "12"
+        operation:            append
+        operation_value:      "nd"
+      6:
+        multipart:            true 
+        gender:               none
+        part1:                ends_in
+        value1:               "3"
+        operator:             and
+        part2:                does_not_end_in
+        value2:               "13"
+        operation:            append
+        operation_value:      "rd"
+      7:
+        multipart:            false 
+        gender:               none
+        part1:                ends_in
+        value1:               "0,4,5,6,7,8,9,11,12,13"
+        operation:            append
+        operation_value:      "th"
+      
+ru:
+  case1:                
+    keyword:                  "nom"
+    latin_name:               "Nominativus"
+    native_name:              "Именительный падеж" 
+    description:              "Есть - Кто? Что?"
+    application:              "words"
+  case2:               
+    keyword:                  "gen"
+    latin_name:               "Genitivus"
+    native_name:              "Родительный падеж" 
+    description:              "Нет - Кого? Чего?"
+    application:              "words"
+    rules:            
+      1:
+        multipart:              false 
+        gender:                 male
+        part1:                  ends_in
+        value1:                 "б, в, г, д, ж, з, к, л, м, н, п, р, с, т, ф, х, ц, ч, ш, щ"
+        operation:              append
+        operation_value:        "a"
+      2:
+        multipart:              false 
+        gender:                 male
+        part1:                  ends_in
+        value1:                 "й"
+        operation:              replace
+        operation_value:        "я"
+      3:
+        multipart:              false 
+        gender:                 female
+        part1:                  ends_in
+        value1:                 "а"
+        operation:              replace
+        operation_value:        "ы"
+      4:
+        multipart:              false 
+        gender:                 female
+        part1:                  ends_in
+        value1:                 "я"
+        operation:              replace
+        operation_value:        "и"
+  case3:               
+    keyword:          "dat"
+    latin_name:       "Dativus"
+    native_name:      "Дательный падеж" 
+    description:      "Рад - Кому? Чему?"
+    application:      "words"
+  case4:               
+    keyword:          "acc"
+    latin_name:       "Accusativus"
+    native_name:      "Винительный падеж" 
+    description:      "Вижу - Кого? Что?"
+    application:      "words"
+  case5:               
+    keyword:          "ins"
+    latin_name:       "Instrumentalis"
+    native_name:      "Творительный падеж" 
+    description:      "Доволен - Кем? Чем?"
+    application:      "words"
+  case6:               
+    keyword:          "pre"
+    latin_name:       "Prepositivus"
+    native_name:      "Предложный падеж" 
+    description:      "Думаю - О ком? О чём?"
+    application:      "words"
+  case7:               
+    keyword:          "pos"
+    latin_name:       "Possessive"
+    native_name:      "Притяжательный падеж" 
+    description:      "Чей?"
+    application:      "words"
+    rules:            
+      1:
+        multipart:              false 
+        gender:                 female
+        part1:                  ends_in
+        value1:                 "ва"
+        operation:              replace
+        operation_value:        "вой"
+      2:
+        multipart:              false 
+        gender:                 male
+        part1:                  ends_in
+        value1:                 "б, в, г, д, ж, з, к, л, м, н, п, р, с, т, ф, х, ц, ч, ш, щ"
+        operation:              append
+        operation_value:        "a"