From 18a4afc50e098b3544fa0fc604177a99b7ad7983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C5=82gorzata=20Ksionek?= Date: Tue, 10 Sep 2019 11:51:37 +0200 Subject: [PATCH] Add code review remarks --- lib/gitlab/i18n/po_linter.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/gitlab/i18n/po_linter.rb b/lib/gitlab/i18n/po_linter.rb index aec3b1a3755..c0687cd9b79 100644 --- a/lib/gitlab/i18n/po_linter.rb +++ b/lib/gitlab/i18n/po_linter.rb @@ -170,16 +170,11 @@ module Gitlab end def translate_plural(entry) - used_plural_variables = entry.plural_id.scan(VARIABLE_REGEX) - plural_variables = fill_in_variables(used_plural_variables) - - used_singular_variables = entry.msgid.scan(VARIABLE_REGEX) - singular_variables = fill_in_variables(used_singular_variables) - numbers_covering_all_plurals.map do |number| translation = FastGettext::Translation.n_(entry.msgid, entry.plural_id, number) index = index_for_pluralization(number) - variables = index == 0 ? singular_variables : plural_variables + used_variables = index == 0 ? entry.msgid.scan(VARIABLE_REGEX) : entry.plural_id.scan(VARIABLE_REGEX) + variables = fill_in_variables(used_variables) translation % variables if variables.any? end