tolk 1.3.4 → 1.3.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/app/assets/stylesheets/tolk/screen.css +19 -0
  2. data/app/controllers/tolk/locales_controller.rb +6 -0
  3. data/app/controllers/tolk/searches_controller.rb +1 -1
  4. data/app/models/tolk/locale.rb +3 -3
  5. data/app/views/layouts/tolk/application.html.erb +1 -1
  6. data/app/views/tolk/searches/_form.html.erb +1 -1
  7. data/config/routes.rb +2 -0
  8. data/lib/tolk.rb +1 -1
  9. data/lib/tolk/version.rb +1 -1
  10. metadata +8 -8
data/app/assets/stylesheets/tolk/screen.css CHANGED
@@ -86,6 +86,25 @@ div#head span.locale a {
86
86
  color: #fff;
87
87
  }
88
88
 
89
+ div#head span.locale form.button_to {
90
+ display: inline;
91
+ }
92
+
93
+ div#head span.locale form.button_to div {
94
+ display: inline;
95
+ }
96
+
97
+ div#head span.locale form.button_to div input {
98
+ color: #fff;
99
+ background: none;
100
+ border: 0;
101
+ font-weight: bold;
102
+ text-decoration: none;
103
+ font-size: 18px;
104
+ color: #2fadcf;
105
+ cursor: pointer;
106
+ }
107
+
89
108
  div#head span:first-child {
90
109
  padding-left: 12px;
91
110
  -webkit-border-top-left-radius: 10px;
data/app/controllers/tolk/locales_controller.rb CHANGED
@@ -37,6 +37,12 @@ module Tolk
37
37
  redirect_to :action => :index
38
38
  end
39
39
 
40
+ def dump_all
41
+ Tolk::Locale.dump_all
42
+ I18n.reload!
43
+ redirect_to request.referrer
44
+ end
45
+
40
46
  private
41
47
 
42
48
  def find_locale
data/app/controllers/tolk/searches_controller.rb CHANGED
@@ -9,7 +9,7 @@ module Tolk
9
9
  private
10
10
 
11
11
  def find_locale
12
- @locale = Tolk::Locale.where('UPPER(name) = UPPER(?)', params[:locale]).first!
12
+ @locale = Tolk::Locale.where('UPPER(name) = UPPER(?)', params[:tolk_locale]).first!
13
13
  end
14
14
  end
15
15
  end
data/app/models/tolk/locale.rb CHANGED
@@ -180,16 +180,16 @@ module Tolk
180
180
  end
181
181
  end
182
182
  end
183
-
183
+
184
184
  private
185
185
 
186
186
 
187
187
  def remove_invalid_translations_from_target
188
188
  self.translations.target.dup.each do |t|
189
- unless t.valid?
189
+ unless t.valid?
190
190
  self.translations.target.delete(t)
191
191
  else
192
- t.updated_at = Time.current # Silly hax to fool autosave into saving the record
192
+ t.updated_at_will_change!
193
193
  end
194
194
  end
195
195
 
data/app/views/layouts/tolk/application.html.erb CHANGED
@@ -13,7 +13,7 @@
13
13
  <body>
14
14
  <div id="container">
15
15
  <div id="head">
16
- <h1><span class="home"><%= link_to "Tolk", root_path %></span><% if @locale.present? %><span class="locale"><%= link_to @locale.language_name, locale_path(@locale) %></span><% end %></h1>
16
+ <h1><span class="home"><%= link_to "Tolk", root_path %></span><% if @locale.present? %><span class="locale"><%= link_to @locale.language_name, locale_path(@locale) %></span><% end %><span class="locale"><%= button_to "Apply Changes", dump_all_locales_path, :method => :post %></span></h1>
17
17
  </div>
18
18
  <%= yield %>
19
19
  </div>
data/app/views/tolk/searches/_form.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <%= form_tag tolk.search_path, :method => :get do %>
2
- <%= hidden_field_tag :locale, locale.name %>
2
+ <%= hidden_field_tag :tolk_locale, locale.name %>
3
3
  Search for
4
4
  <%= scope_selector_for(@locale) %>
5
5
  phrase:
data/config/routes.rb CHANGED
@@ -1,5 +1,7 @@
1
1
  Tolk::Engine.routes.draw do
2
2
  root :to => 'locales#index'
3
+
4
+ post "/dump_all" => "locales#dump_all", :as => :dump_all_locales
3
5
  resources :locales do
4
6
  member do
5
7
  get :all
data/lib/tolk.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'will_paginate'
2
- require 'ya2yaml'
2
+ require 'safe_yaml'
3
3
  require 'tolk/config'
4
4
  require 'tolk/engine'
5
5
  require 'tolk/sync'
data/lib/tolk/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tolk
2
- VERSION = "1.3.4"
2
+ VERSION = "1.3.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tolk
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.4
4
+ version: 1.3.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2012-10-25 00:00:00.000000000 Z
15
+ date: 2013-02-08 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: will_paginate
@@ -31,21 +31,21 @@ dependencies:
31
31
  - !ruby/object:Gem::Version
32
32
  version: '0'
33
33
  - !ruby/object:Gem::Dependency
34
- name: ya2yaml
34
+ name: safe_yaml
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  none: false
37
37
  requirements:
38
- - - ~>
38
+ - - ! '>='
39
39
  - !ruby/object:Gem::Version
40
- version: '0.26'
40
+ version: '0'
41
41
  type: :runtime
42
42
  prerelease: false
43
43
  version_requirements: !ruby/object:Gem::Requirement
44
44
  none: false
45
45
  requirements:
46
- - - ~>
46
+ - - ! '>='
47
47
  - !ruby/object:Gem::Version
48
- version: '0.26'
48
+ version: '0'
49
49
  description: Tolk is a web interface for doing i18n translations packaged as an engine
50
50
  for Rails applications.
51
51
  email: david@loudthinking.com
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
109
109
  version: '0'
110
110
  requirements: []
111
111
  rubyforge_project:
112
- rubygems_version: 1.8.24
112
+ rubygems_version: 1.8.23
113
113
  signing_key:
114
114
  specification_version: 3
115
115
  summary: Rails engine providing web interface for managing i18n yaml files