From 31b4dc3862e9cbd4daf9e0eb3f7befe21d4f5ba7 Mon Sep 17 00:00:00 2001 From: Sebastian Ludwig Date: Fri, 27 Nov 2015 15:13:23 +0100 Subject: [PATCH 1/5] Removed unncessary check. --- lib/twine/stringsfile.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/twine/stringsfile.rb b/lib/twine/stringsfile.rb index 36373ff..3614ba1 100644 --- a/lib/twine/stringsfile.rb +++ b/lib/twine/stringsfile.rb @@ -106,9 +106,7 @@ module Twine end def set_developer_language_code(code) - if @language_codes.include?(code) - @language_codes.delete(code) - end + @language_codes.delete(code) @language_codes.insert(0, code) end From e09b366a531a0eadbaf81e69f9ecf2346831ee73 Mon Sep 17 00:00:00 2001 From: Sebastian Ludwig Date: Fri, 27 Nov 2015 15:14:52 +0100 Subject: [PATCH 2/5] Removed setter methods for Abstract formatter attributes. --- lib/twine/formatters/abstract.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/twine/formatters/abstract.rb b/lib/twine/formatters/abstract.rb index 64e721d..64615ef 100644 --- a/lib/twine/formatters/abstract.rb +++ b/lib/twine/formatters/abstract.rb @@ -3,8 +3,8 @@ require 'fileutils' module Twine module Formatters class Abstract - attr_accessor :strings - attr_accessor :options + attr_reader :strings + attr_reader :options def self.can_handle_directory?(path) return false From 36a1321b9b21dfb0a359a6d7b95e0090ac59c052 Mon Sep 17 00:00:00 2001 From: Sebastian Ludwig Date: Fri, 27 Nov 2015 15:18:05 +0100 Subject: [PATCH 3/5] Shortened expression to check if a StringsRow matches a given set of tags. --- lib/twine/stringsfile.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/twine/stringsfile.rb b/lib/twine/stringsfile.rb index 3614ba1..0ba1897 100644 --- a/lib/twine/stringsfile.rb +++ b/lib/twine/stringsfile.rb @@ -42,11 +42,7 @@ module Twine elsif @tags.empty? return include_untagged else - tags.each do |tag| - if @tags.include? tag - return true - end - end + return !(tags & @tags).empty? end return false From 77acb3377369ed524f1f298c93ffa71a4dc9d2d8 Mon Sep 17 00:00:00 2001 From: Sebastian Ludwig Date: Fri, 27 Nov 2015 15:22:00 +0100 Subject: [PATCH 4/5] Corrected indentation in Abstract.set_translation_for_key. --- lib/twine/formatters/abstract.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/twine/formatters/abstract.rb b/lib/twine/formatters/abstract.rb index 64615ef..30f9ab7 100644 --- a/lib/twine/formatters/abstract.rb +++ b/lib/twine/formatters/abstract.rb @@ -90,7 +90,7 @@ module Twine current_section.rows << current_row if @options[:tags] && @options[:tags].length > 0 - current_row.tags = @options[:tags] + current_row.tags = @options[:tags] end @strings.strings_map[key] = current_row From e76e63909c2a2f124d24dc4d7cb3d3c043daf062 Mon Sep 17 00:00:00 2001 From: Sebastian Ludwig Date: Fri, 27 Nov 2015 15:55:35 +0100 Subject: [PATCH 5/5] Shortened check for wrapping accents in StringsFile.read. --- lib/twine/stringsfile.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/twine/stringsfile.rb b/lib/twine/stringsfile.rb index 0ba1897..863d8d0 100644 --- a/lib/twine/stringsfile.rb +++ b/lib/twine/stringsfile.rb @@ -148,9 +148,8 @@ module Twine if match key = match[1].strip value = match[2].strip - if value[0,1] == '`' && value[-1,1] == '`' - value = value[1..-2] - end + + value = value[1..-2] if value[0] == '`' && value[-1] == '`' case key when 'comment'