translation_center 1.2.0 → 1.2.1

data/README.md

@@ -1,5 +1,6 @@
-## Code Status
+## Translation Center Status
 [![Code Climate](https://codeclimate.com/github/BadrIT/translation_center.png)](https://codeclimate.com/github/BadrIT/translation_center)
+[![Gem Version](https://badge.fury.io/rb/translation_center.png)](http://badge.fury.io/rb/translation_center)
 
 ## Introduction
 
@@ -33,7 +34,7 @@ Manage all app translations; collect stats, accept, add, edit, remove translatio
 
 ## Getting started
 
-TranslationCenter works with Rails 3.2 onwards. You can add it to your Gemfile with:
+TranslationCenter works with Rails 3.1 onwards. You can add it to your Gemfile with:
 
 ```ruby
 gem 'translation_center'

data/app/assets/stylesheets/translation_center/translation_keys.css

@@ -40,4 +40,9 @@
 
 .key_editable {
   cursor: pointer;
+}
+
+.created_time {
+  font-size: 10px;
+  color: black;
 }

data/app/assets/stylesheets/translation_center/translations.css

@@ -28,6 +28,5 @@
 }
 
 .votes_count {
-  margin-left: 236px;
   margin-top: 13px;
 }

data/app/helpers/translation_center/application_helper.rb

@@ -31,5 +31,10 @@ module TranslationCenter
       current_user.respond_to?(:can_admin_translations?) && current_user.can_admin_translations?
     end
 
+    # returns formated date
+    def format_date(date)
+      date.strftime('%e %b %Y')
+    end
+
   end
 end

data/app/views/translation_center/translation_keys/_show.html.haml

@@ -8,11 +8,11 @@
             %span.badge.badge-info.pull-left.translations_count{ id: "translations_#{translation_key.id}_count"}
               = translation_key.translations.in(to_lang).count
             %span
-              = t('.Translations')
+              = t('.translations')
 
         %li
           %a{"data-toggle" => "tab", :href => "#add_translations#{translation_key.id}"}
-            = t('.Add/Edit_Translation')
+            = t('.add_edit_translation')
       .tab-content
         
         .tab-pane.active{ id: "translations#{translation_key.id}" }

data/app/views/translation_center/translation_keys/_show_keys.html.haml

@@ -5,6 +5,7 @@
     .translation_key_badge.badge-important{title: t('.untranslated')}
   - else
     .translation_key_badge.badge-warning{title: t('.waiting_acceptance')}
+
   - if translation_admin?
     %div
       = link_to '×', translation_key_path(translation_key), method: :delete, data: { confirm: t('actions.are_you_sure', :default => 'Are you sure?') }, class: 'close', remote: true
@@ -14,6 +15,10 @@
       %b
         %em
           = t(translation_key.name)
+      %span
+        %em.created_time
+          = t('.created_at')
+          = format_date(translation_key.created_at)
     
     %small
       %div{ 'data-key-id' => translation_key.id, class: "#{translation_admin? ? 'key_editable' : '' }"}

data/app/views/translation_center/translations/_index.html.haml

@@ -1,4 +1,4 @@
-= t('.sort_by:')
+= t('.sort_by')
 %a.sort_by_date{ href: '#', 'data-key-id' => translation_key.id }
   = t('.date')
 %a.sort_by_votes{ href: '#', 'data-key-id' => translation_key.id }

data/app/views/translation_center/translations/_show.html.haml

@@ -14,21 +14,21 @@
           = t('.you')
         - else
           = translation.user.send(TranslationCenter::CONFIG['identifier_type'])
-        = t('.on')
-        = I18n.localize(translation.created_at, format: '%b, %d %Y')
+        = t('.on_date')
+        = format_date(translation.created_at)
   %div.translation_voting
-    %a{href: '#'}
+    - if translation_admin?
+      = render 'translation_center/translations/accept_translation', translation: translation
+    .votes_count.badge.badge-success.pull-right
+      %span.count{ 'data-translation-id' => translation.id }
+        = translation.votes.count
+      = t('.votes')
+    %a.pull-right{href: '#'}
       - voted = current_user.voted_on?(translation)
       %span.badge.pull-left.translations_vote{ class: "#{voted ? 'badge-success' : ''}", 'data-translation-id' => translation.id,  voted: voted.to_s}
         - if voted
           = t('.unvote')
         - else
           = t('.vote')
-    - if translation_admin?
-      = render 'translation_center/translations/accept_translation', translation: translation
-    .votes_count.badge.badge-success
-      %span.count{ 'data-translation-id' => translation.id }
-        = translation.votes.count
-      = t('.votes')
 
 

data/lib/generators/translation_center/install/templates/config/translation_center.yml

@@ -22,7 +22,7 @@ development:
   # "missing" to inspect only untranslated keys
   # "all" to enable inspector for translated and untranslated keys
   # "off" to turn off keys inspector
-  inspector: 'all' # default missing
+  inspector: 'missing' # default missing
 
   # I18n.translate source
   i18n_source: 'db' # can be db or yaml; default is yaml

data/lib/translation_center.rb

@@ -4,6 +4,9 @@ require "translation_center/translation_helpers"
 require "translation_center/translations_transfer"
 
 module TranslationCenter
+
+  # add translations for translations center
+  I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'translation_center', 'locale', '*.yml')]
 end
 
 

data/lib/translation_center/locale/en.yml

@@ -0,0 +1,65 @@
+en:
+    translation_center: 
+        back_to_app: "Back To App"
+        categories: 
+            category: 
+                complete: Complete
+                keys: Keys
+            index: 
+                categories: Categories
+            show: 
+                all: All
+                pending: Pending
+                translated: Translated
+                untranslated: Untranslated
+        center: 
+            activity: 
+                ago: Ago
+                changes: Changes
+                key: Key
+                locale: Locale
+                time: Time
+                user: User
+            dashboard: 
+                activity: Activity
+                all: All
+                controls: Controls
+                dashboard: Dashboard
+                language: Language
+                pending: Pending
+                progress: Progress
+                reset: Reset
+                search: Search
+                select_locale: "Select Locale"
+                these_actions_will_affect_existing_data: "These actions will affect existing data"
+                translated: Translated
+                untranslated: Untranslated
+        dashboard: Dashboard
+        search_keys: "Search Keys"
+        translate_to: "Translate To"
+        translation_center: "Translation Center"
+        translation_keys: 
+            destroyed_successfully: "Destroyed Successfully"
+            show: 
+                translations: Translations
+                add_edit_translation: "Add/Edit Translation"
+                back_to_category: "Back To Category"
+                destroy: Destroy
+            show_keys: 
+                created_at: "created at"
+                translated: Translated
+            translation_keys: 
+                no_translation_keys: "No Translation Keys"
+        translations: 
+            accept_translation: 
+                unaccept: Unaccept
+            index: 
+                date: Date
+                sort_by: "Sort by"
+                votes: Votes
+            show: 
+                by: by
+                on_date: "on date"
+                vote: Vote
+                votes: Votes
+                you: You

data/lib/translation_center/translation_helpers.rb

@@ -32,7 +32,7 @@ module TranslationCenter
   # wraps a span if inspector option is set to all
   def wrap_span(translation, translation_key)
     # put the inspector class if inspector is all and the key doesn't belongs to translation_center
-    if TranslationCenter::CONFIG['inspector'] == 'all' && translation_key.name.split('.').first != 'translation_center'
+    if TranslationCenter::CONFIG['inspector'] == 'all' && translation_key.name.to_s.split('.').first != 'translation_center'
       "<span class='tc-inspector-key' data-type='#{translation_key.status(I18n.locale)}' data-id='#{translation_key.id}'> #{translation} </span>".html_safe
     else
       translation
@@ -41,7 +41,8 @@ module TranslationCenter
 
   def translate_with_adding(locale, key, options = {})
     # handle calling translation with a blank key
-    return translate_without_adding(locale, key, options) if key.blank?
+    # or translation center tables don't exist
+    return translate_without_adding(locale, key, options) if key.blank? || !ActiveRecord::Base.connection.table_exists?('translation_center_translation_keys')
 
     # add the new key or update it
     translation_key = TranslationCenter::TranslationKey.find_or_create_by_name(key)
@@ -83,6 +84,7 @@ module I18n
     module Base
       # added another class to be used
       def html_message
+        category = keys.first
         key = keys.last.to_s.gsub('_', ' ').gsub(/\b('?[a-z])/) { $1.capitalize }
         translation_key = keys
         # remove locale
@@ -90,7 +92,7 @@ module I18n
 
         translation_key = TranslationCenter::TranslationKey.find_by_name(translation_key.join('.'))
         # don't put the inspector class if inspector is off or the key belongs to translation_center
-        if TranslationCenter::CONFIG['inspector'] == 'off' || translation_key.name.split('.').first == 'translation_center'
+        if TranslationCenter::CONFIG['inspector'] == 'off' || category == 'translation_center'
           %(<span class="translation_missing" title="translation missing: #{keys.join('.')}">#{key}</span>)
         else
           %(<span class="translation_missing tc-inspector-key" data-type="#{translation_key.status(I18n.locale)}" data-id="#{translation_key.id}" title="translation missing: #{keys.join('.')}">#{key}</span>)

data/lib/translation_center/version.rb

@@ -1,3 +1,3 @@
 module TranslationCenter
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/dummy/app/controllers/articles_controller.rb

@@ -0,0 +1,85 @@
+class ArticlesController < ApplicationController
+  before_filter :authenticate_user!
+
+  # GET /articles
+  # GET /articles.json
+  def index
+    @articles = Article.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @articles }
+    end
+  end
+
+  # GET /articles/1
+  # GET /articles/1.json
+  def show
+    @article = Article.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @article }
+    end
+  end
+
+  # GET /articles/new
+  # GET /articles/new.json
+  def new
+    @article = Article.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @article }
+    end
+  end
+
+  # GET /articles/1/edit
+  def edit
+    @article = Article.find(params[:id])
+  end
+
+  # POST /articles
+  # POST /articles.json
+  def create
+    @article = Article.new(params[:article])
+
+    respond_to do |format|
+      if @article.save
+        format.html { redirect_to @article, notice: 'Article was successfully created.' }
+        format.json { render json: @article, status: :created, location: @article }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @article.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /articles/1
+  # PUT /articles/1.json
+  def update
+    @article = Article.find(params[:id])
+
+    respond_to do |format|
+      if @article.update_attributes(params[:article])
+        format.html { redirect_to @article, notice: 'Article was successfully updated.' }
+        format.json { head :ok }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @article.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /articles/1
+  # DELETE /articles/1.json
+  def destroy
+    @article = Article.find(params[:id])
+    @article.destroy
+
+    respond_to do |format|
+      format.html { redirect_to articles_url }
+      format.json { head :ok }
+    end
+  end
+end

data/test/dummy/app/helpers/articles_helper.rb

@@ -0,0 +1,2 @@
+module ArticlesHelper
+end

data/test/dummy/app/models/article.rb

@@ -0,0 +1,5 @@
+class Article < ActiveRecord::Base
+
+  attr_accessible :title, :content
+
+end

data/test/dummy/app/models/user.rb

@@ -7,14 +7,10 @@ class User < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me
-  # attr_accessible :title, :body
 
-  acts_as_voter
   acts_as_translator
 
   def can_admin_translations?
-    self.email != 'khaled@ok.com'
+    self.id == User.first.id
   end
-
-
 end

data/test/dummy/app/views/articles/_form.html.haml

@@ -0,0 +1,16 @@
+= form_for @article do |f|
+  - if @article.errors.any?
+    #error_explanation
+      %h2= "#{pluralize(@article.errors.count, "error")} prohibited this article from being saved:"
+      %ul
+        - @article.errors.full_messages.each do |msg|
+          %li= msg
+
+  .field
+    = f.label :title
+    = f.text_field :title
+  .field
+    = f.label :content
+    = f.text_area :content
+  .actions
+    = f.submit 'Save'

data/test/dummy/app/views/articles/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing article
+
+= render 'form'
+
+= link_to 'Show', @article
+\|
+= link_to 'Back', articles_path

data/test/dummy/app/views/articles/index.html.haml

@@ -0,0 +1,21 @@
+%h1 Listing articles
+
+%table
+  %tr
+    %th Title
+    %th Content
+    %th
+    %th
+    %th
+
+  - @articles.each do |article|
+    %tr
+      %td= article.title
+      %td= article.content
+      %td= link_to 'Show', article
+      %td= link_to 'Edit', edit_article_path(article)
+      %td= link_to 'Destroy', article, :method => :delete, :data => { :confirm => 'Are you sure?' }
+
+%br
+
+= link_to 'New Article', new_article_path

data/test/dummy/app/views/articles/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New article
+
+= render 'form'
+
+= link_to 'Back', articles_path

data/test/dummy/app/views/articles/show.html.haml

@@ -0,0 +1,12 @@
+%p#notice= notice
+
+%p
+  %b Title:
+  = @article.title
+%p
+  %b Content:
+  = @article.content
+
+= link_to 'Edit', edit_article_path(@article)
+\|
+= link_to 'Back', articles_path

data/test/dummy/config/initializers/devise.rb

@@ -82,7 +82,7 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = "9141e789f943c8b15f3e643b632a94305687f95a9095609d89acbc576c7b34cfe745332a4d7a90fb616ccceb934fe017c1532444dda675facfbe48a7fe1d5a73"
+  # config.pepper = "04916f04c90691d81f589fcb4c6a5b3ab711fc0fb33e1b061b4d0922ecb1feeee72d10bb61537350d8fa35a12513266c8b087714ae65b9e4a8ed9cc5aa56581a"
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without
@@ -92,6 +92,14 @@ Devise.setup do |config|
   # the user cannot access the website without confirming his account.
   # config.allow_unconfirmed_access_for = 2.days
 
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
   # If true, requires any email changes to be confirmed (exactly the same way as
   # initial account confirmation) to be applied. Requires additional unconfirmed_email
   # db field (see migrations). Until confirmed new email is stored in
@@ -113,8 +121,8 @@ Devise.setup do |config|
   # config.rememberable_options = {}
 
   # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
-  # config.password_length = 6..128
+  # Range for password length. Default is 8..128.
+  config.password_length = 8..128
 
   # Email regex used to validate email formats. It simply asserts that
   # an one (and only one) @ exists in the given string. This is mainly
@@ -125,7 +133,7 @@ Devise.setup do |config|
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
   # config.timeout_in = 30.minutes
-  
+
   # If true, expires auth token on session timeout.
   # config.expire_auth_token_on_timeout = false
 
@@ -229,4 +237,4 @@ Devise.setup do |config|
   # When using omniauth, Devise cannot automatically set Omniauth path,
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = "/my_engine/users/auth"
-end
+end