express_translate 1.0.6 → 1.0.7

data/README.md

@@ -22,7 +22,7 @@ Express Translate
 ##Installation
 ### 1. Gemfile
 ```bash
-gem 'express_translate', '~> 1.0.6'
+gem 'express_translate', '~> 1.0.7'
 ```
  
 ### 2. Setup
@@ -51,7 +51,7 @@ redis-server
 
 ### Modify accounts
 
-Account list config in "/config/express_translate.yml"
+Account list config in "/config/express_translate.yml".
 You can add account:
 ```bash
 account: 

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/app/assets/stylesheets/express_translate/express_translate.css.scss

@@ -642,6 +642,11 @@ body#express_translate {
           -webkit-box-sizing:border-box;
         }
       }
+      
+      & > .waiting {
+        position:relative;
+        top: 40px;
+      }
     }
     
     .footer {

data/app/controllers/express_translate/ajax/languages_controller.rb

@@ -40,10 +40,16 @@ class ExpressTranslate::Ajax::LanguagesController < ActionController::Base
   # render to html content
   def load_content_language(params, check)
     if check['success'] == true
-      origin = Language.get_origin(params[:packages])
+      @selects = YAML.load_file("#{ExpressTranslate.root}/config/languages.yml")
+      @origin = Language.get_origin(params[:packages])
+      @origin_keys = []
+      LanguageDetail.info(@origin).all.each do |item|
+        @origin_keys.push(item["code"])
+      end
       @languages = Package.find(params[:packages])['language']
-      @max = origin.nil? ? 1 : LanguageDetail.info(origin).all.count
+      @max = @origin.nil? ? 1 : LanguageDetail.info(@origin).all.count
       @LanguageDetail = LanguageDetail
+      @Package = Package
       render :action => :language_update
       return
     end

data/app/controllers/express_translate/options_controller.rb

@@ -22,9 +22,13 @@ class ExpressTranslate::OptionsController < ExpressTranslate::BaseController
   # Get max count of percent translate
   def languages
     @selects = YAML.load_file("#{ExpressTranslate.root}/config/languages.yml")
-    origin = Language.get_origin(params[:packages])
+    @origin = Language.get_origin(params[:packages])
+    @origin_keys = []
+    LanguageDetail.info(@origin).all.each do |item|
+      @origin_keys.push(item["code"])
+    end
     @languages = Package.find(params[:packages])['language']
-    @max = origin.nil? ? 1 : LanguageDetail.info(origin).all.count
+    @max = @origin.nil? ? 1 : LanguageDetail.info(@origin).all.count
     @LanguageDetail = LanguageDetail
     @Package = Package
     render :action => :languages, layout: 'express_translate/translate'

data/app/views/express_translate/ajax/languages/_content_language.html.erb

@@ -1,8 +1,13 @@
 <% @languages.each do |lang| %>
   <a class="lang origin_<%= lang['is_origin'] %>" href="/express_translate/language/<%= params[:packages] %>/<%= lang['id'] %>" style="background-image: url('/assets/express_translate/flags/<%= lang['id'] %>.png')">
     <span><%= lang['text'].slice(0,1).capitalize + lang['text'].slice(1..-1) %></span>
-    <p><%= (@LanguageDetail.info(lang).all.count.to_f / (@max == 0 ? 1 : @max) * 100).to_i %>%</p>
-    <h5><%= @LanguageDetail.info(lang).all.count %>/<%= @max %></h5>
+    <% @lang_keys = [] %>
+    <% @LanguageDetail.info(lang).all.each do |item| %>
+    <%   @lang_keys.push(item["code"]) %>
+    <% end %>
+    <% count = (@lang_keys & @origin_keys).count %>
+    <p><%= (count.to_f / (@max == 0 ? 1 : @max) * 100).to_i %>%</p>
+    <h5><%= count %>/<%= @max %></h5>
     <h4><%= lang['id'] %></h4>
     <div class="tools">
       <div class="tool remove" data="<%= lang['id'] %>"></div>

data/app/views/express_translate/options/language_detail.html.erb

@@ -1,6 +1,13 @@
-<div class="content" id="content_code">
-  
+<div class="content" id="content_code" style='background-color:rgba(0,0,0,0.8)'>
+  <div class="waiting">
+    <div class="bubblingG">
+      <p id="bubblingG_1"></p>
+      <p id="bubblingG_2"></p>
+      <p id="bubblingG_3"></p>
+    </div>
+  </div>
 </div>
+
 <div class="popup">
   <form id="add_code">
     <div class="title">Add Code</div>
@@ -195,6 +202,7 @@
         if (data.success) {
           var template = Handlebars.compile($("#code_item").html());
           contentCode.html(template(data));
+          contentCode.css("background-color", "");
           runJavascriptsCode();
         }
       }

data/express_translate.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "express_translate"
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karl"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_translate
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -406,7 +406,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2008451929382581134
+      hash: 4559105549552093352
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: