github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-22 11:35:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: escape regex chars when searching site texts

Browse Source
This commit is contained in:
Maja Komel 2018-09-02 09:25:57 +02:00 committed by Sam
parent f5e0356fb2
commit 182d9a4666
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/freedom_patches/translate_accelerator.rb
View File

@ -68,7 +68,7 @@ module I18n
target = opts[:backend] || backend
results = opts[:overridden] ? {} : target.search(config.locale, query)
regexp = /#{query}/i
regexp = /#{Regexp.escape(query)}/i
(overrides_by_locale(locale) || {}).each do |k, v|
results.delete(k)
results[k] = v if (k =~ regexp || v =~ regexp)

4
spec/components/discourse_i18n_spec.rb
View File

@ -116,7 +116,9 @@ describe I18n::Backend::DiscourseI18n do
TranslationOverride.upsert!('en', 'wat', 'Overwritten value')
expect(I18n.search('wat', backend: backend)).to eq('wat' => 'Overwritten value')
expect(I18n.search('Overwritten', backend: backend)).to eq('wat' => 'Overwritten value')
expect(I18n.search('Hello', backend: backend)).to eq({})
TranslationOverride.upsert!('en', 'wat', 'Overwritten with (parentheses)')
expect(I18n.search('Overwritten with (', backend: backend)).to eq('wat' => 'Overwritten with (parentheses)')
end
it 'supports disabling' do