Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes rubocop offenses #564

Merged
merged 2 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
on:
push:
branches: [ main ]
branches: [main]
pull_request:
types: [ opened, synchronize ]
types: [opened, synchronize]
jobs:
lint:
runs-on: ubuntu-latest
Expand All @@ -14,7 +14,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.6'
ruby-version: "2.6"
bundler-cache: true

- name: Set-up RuboCop Problem Matcher
Expand All @@ -26,7 +26,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7', '2.6']
ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
fail-fast: false
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
GOOGLE_TRANSLATE_API_KEY: ${{ secrets.GOOGLE_TRANSLATE_API_KEY }}
Expand Down
8 changes: 4 additions & 4 deletions lib/i18n/tasks/key_pattern_matching.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ def compile_key_pattern(key_pattern)

def key_pattern_re_body(key_pattern)
key_pattern
.gsub(/\./, '\.')
.gsub(/\*:/, '[^.]+?')
.gsub(/\*/, '.*')
.gsub(/:/, '(?<=^|\.)[^.]+?(?=\.|$)')
.gsub('.', '\.')
.gsub('*:', '[^.]+?')
.gsub('*', '.*')
.gsub(':', '(?<=^|\.)[^.]+?(?=\.|$)')
.gsub(/\{(.*?)}/) { "(#{Regexp.last_match(1).strip.gsub(/\s*,\s*/, '|')})" }
end
end
2 changes: 1 addition & 1 deletion lib/i18n/tasks/scanners/relative_keys.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def prefix(normalized_path, calling_method: nil)
"#{file_key.sub(/_controller$/, '')}.#{calling_method}"
else
# Remove _ prefix from partials
file_key.gsub(/\._/, DOT)
file_key.gsub('._', DOT)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/tasks/scanners/ruby_ast_scanner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def comments_to_occurences(path, ast, comments)
results = []

# method_name is not available at this stage
calls.each do |send_node, _method_name|
calls.each do |(send_node, _method_name)|
@matchers.each do |matcher|
result = matcher.convert_to_key_occurrences(
send_node,
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/tasks/translators/google_translator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def options_for_translate_values(from:, to:, **options)
options.merge(
api_key: api_key,
from: from,
to: to,
to: to
)
end

Expand Down
16 changes: 8 additions & 8 deletions spec/google_translate_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
'config/locales/zh-tw.yml' => '',
'config/locales/zh-hant.yml' => '',
'config/locales/zh-hk.yml' => '',
'config/locales/es.yml' => '',
'config/locales/es.yml' => ''
)
end

Expand All @@ -99,18 +99,18 @@
task.data[:en] = build_tree('en' => { 'common' => { 'a' => 'λ', 'horse' => 'horse' } })

# Loading translations seems to require at least one existing value.
%w(zh zh-cn zh-hans zh-tw zh-hant zh-hk).each do |locale|
%w[zh zh-cn zh-hans zh-tw zh-hant zh-hk].each do |locale|
task.data[locale] = build_tree(locale => { 'common' => { 'a' => 'λ' } })
end

run_cmd 'translate-missing'

expect(task.t('common.horse', 'zh' )).to eq("马") # Simplified Chinese
expect(task.t('common.horse', 'zh-cn' )).to eq("马") # Simplified Chinese
expect(task.t('common.horse', 'zh-hans')).to eq("马") # Simplified Chinese
expect(task.t('common.horse', 'zh-tw' )).to eq("馬") # Traditional Chinese
expect(task.t('common.horse', 'zh-hant')).to eq("馬") # Traditional Chinese
expect(task.t('common.horse', 'zh-hk' )).to eq("馬") # Traditional Chinese
expect(task.t('common.horse', 'zh')).to eq('马') # Simplified Chinese
expect(task.t('common.horse', 'zh-cn')).to eq('马') # Simplified Chinese
expect(task.t('common.horse', 'zh-hans')).to eq('马') # Simplified Chinese
expect(task.t('common.horse', 'zh-tw')).to eq('馬') # Traditional Chinese
expect(task.t('common.horse', 'zh-hant')).to eq('馬') # Traditional Chinese
expect(task.t('common.horse', 'zh-hk')).to eq('馬') # Traditional Chinese
end
end
end
Expand Down
Loading