tolk 1.3.2 → 1.3.3

Sign up to get free protection for your applications and to get access to all the features.
@@ -288,6 +288,11 @@ table.translations .highlight {
288
288
  background-color: yellow;
289
289
  }
290
290
 
291
+ table.translations .phrase .carriage_return {
292
+ color: #2fadcf;
293
+ font-weight: bold;
294
+ }
295
+
291
296
  /*-------------------------------------------------
292
297
  Pagination
293
298
  -------------------------------------------------*/
@@ -40,7 +40,7 @@ module Tolk
40
40
  private
41
41
 
42
42
  def find_locale
43
- @locale = Tolk::Locale.find_by_name!(params[:id])
43
+ @locale = Tolk::Locale.where('UPPER(name) = UPPER(?)', params[:id]).first!
44
44
  end
45
45
  end
46
46
  end
@@ -9,7 +9,7 @@ module Tolk
9
9
  private
10
10
 
11
11
  def find_locale
12
- @locale = Tolk::Locale.find_by_name!(params[:locale])
12
+ @locale = Tolk::Locale.where('UPPER(name) = UPPER(?)', params[:locale]).first!
13
13
  end
14
14
  end
15
15
  end
@@ -1,11 +1,11 @@
1
1
  module Tolk
2
2
  module ApplicationHelper
3
3
  def format_i18n_value(value)
4
- h(yaml_value(value)).gsub(/\n/, '<br />').html_safe
4
+ h(yaml_value(value)).gsub(/\n/, '<span class="carriage_return">&crarr;</span><br />').html_safe
5
5
  end
6
6
 
7
7
  def format_i18n_text_area_value(value)
8
- yaml_value(value)
8
+ yaml_value(value).to_s.force_encoding("UTF-8")
9
9
  end
10
10
 
11
11
  def yaml_value(value)
data/lib/tolk/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tolk
2
- VERSION = "1.3.2"
2
+ VERSION = "1.3.3"
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.2
4
+ version: 1.3.3
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-07-23 00:00:00.000000000 Z
15
+ date: 2012-09-05 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: will_paginate