diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/acts_as_xapian/tasks/xapian.rake | 2 | ||||
| -rw-r--r-- | lib/attachment_to_html/adapter.rb | 2 | ||||
| -rw-r--r-- | lib/languages.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/acts_as_xapian/tasks/xapian.rake b/lib/acts_as_xapian/tasks/xapian.rake index c1986ce1e..52d94011a 100644 --- a/lib/acts_as_xapian/tasks/xapian.rake +++ b/lib/acts_as_xapian/tasks/xapian.rake @@ -9,7 +9,7 @@ namespace :xapian do # "verbose=true" to print model name as it is run. desc 'Updates Xapian search index with changes to models since last call' task :update_index => :environment do - ActsAsXapian.update_index(ENV['flush'] ? true : false, ENV['verbose'] ? true : false) + ActsAsXapian.update_index(ENV['flush'], ENV['verbose']) end # Parameters - specify 'models="PublicBody User"' to say which models diff --git a/lib/attachment_to_html/adapter.rb b/lib/attachment_to_html/adapter.rb index d8b9f41f7..058fb2a01 100644 --- a/lib/attachment_to_html/adapter.rb +++ b/lib/attachment_to_html/adapter.rb @@ -41,7 +41,7 @@ module AttachmentToHTML end def contains_images? - !!body.match(/<img[^>]*>/mi) + body.match(/<img[^>]*>/mi) end def create_tempfile(text) diff --git a/lib/languages.rb b/lib/languages.rb index 7d03bc60a..4f51f9bee 100644 --- a/lib/languages.rb +++ b/lib/languages.rb @@ -32,6 +32,7 @@ class LanguageNames 'ce' => 'нохчийн мотт', 'ny' => 'chiCheŵa', 'zh' => '中文 (Zhōngwén)', + 'zh-HK' => '中文(香港)', 'cv' => 'чӑваш чӗлхи', 'kw' => 'Kernewek', 'co' => 'corsu', @@ -188,6 +189,7 @@ class LanguageNames 'zu' => 'isiZulu' } locale = locale.sub("_", "-") # normalize + return language_names[locale] if language_names[locale] main_part = I18n::Locale::Tag::Simple.tag(locale).subtags[0] return language_names[main_part] end |