Commit 49b38194 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Only perform `join_message` in `validate_variable_usage`

parent 1da594d3
...@@ -86,16 +86,8 @@ module Gitlab ...@@ -86,16 +86,8 @@ module Gitlab
validate_unnamed_variables(errors, required_variables) validate_unnamed_variables(errors, required_variables)
validate_translation(errors, message_id, required_variables) validate_translation(errors, message_id, required_variables)
message_translation = join_message(message_translation)
# We don't need to validate when the message is empty.
# Translations could fallback to the default, or we could be validating a
# language that does not have plurals.
unless message_translation.empty?
validate_variable_usage(errors, message_translation, required_variables) validate_variable_usage(errors, message_translation, required_variables)
end end
end
def validate_translation(errors, message_id, used_variables) def validate_translation(errors, message_id, used_variables)
variables = fill_in_variables(used_variables) variables = fill_in_variables(used_variables)
...@@ -150,6 +142,13 @@ module Gitlab ...@@ -150,6 +142,13 @@ module Gitlab
end end
def validate_variable_usage(errors, translation, required_variables) def validate_variable_usage(errors, translation, required_variables)
translation = join_message(translation)
# We don't need to validate when the message is empty.
# Translations could fallback to the default, or we could be validating a
# language that does not have plurals.
return if translation.empty?
found_variables = translation.scan(VARIABLE_REGEX) found_variables = translation.scan(VARIABLE_REGEX)
missing_variables = required_variables - found_variables missing_variables = required_variables - found_variables
......
...@@ -226,7 +226,6 @@ describe Gitlab::PoLinter do ...@@ -226,7 +226,6 @@ describe Gitlab::PoLinter do
expect(errors).to include('Failure translating to en with []: broken') expect(errors).to include('Failure translating to en with []: broken')
end end
it "adds an error when trying to translate with incorrect variables when using unnamed variables" do it "adds an error when trying to translate with incorrect variables when using unnamed variables" do
errors = [] errors = []
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment