Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: converts “ and ” to " in local dates (#10987)

This commit is contained in:
Joffrey JAFFEUX 2020-10-21 17:16:36 +02:00 committed by GitHub
parent f4842ae283
commit 6811902a70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
View File

@ -13,7 +13,7 @@ function addLocalDate(buffer, matches, state) {
countdown: null, countdown: null,
}; };
const matchString = matches[1].replace(/„|“|«|»/g, '"'); const matchString = matches[1].replace(/„|“|«|»|“|”/g, '"');
let parsed = parseBBCodeTag( let parsed = parseBBCodeTag(
"[date date" + matchString + "]", "[date date" + matchString + "]",

15
plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
View File

@ -81,10 +81,19 @@ describe PrettyText do
end end
end end
context 'german quotes' do context 'special quotes' do
let(:post) { Fabricate(:post, raw: '[date=2019-10-16 time=14:00:00 format="LLLL" timezone=„America/New_York“]') } it 'converts special quotes to regular quotes' do
# german
post = Fabricate(:post, raw: '[date=2019-10-16 time=14:00:00 format="LLLL" timezone=„America/New_York“]')
excerpt = PrettyText.excerpt(post.cooked, 200)
expect(excerpt).to eq('Wednesday, October 16, 2019 6:00 PM (UTC)')
it 'converts german quotes to regular quotes' do # french
post = Fabricate(:post, raw: '[date=2019-10-16 time=14:00:00 format="LLLL" timezone=«America/New_York»]')
excerpt = PrettyText.excerpt(post.cooked, 200)
expect(excerpt).to eq('Wednesday, October 16, 2019 6:00 PM (UTC)')
post = Fabricate(:post, raw: '[date=2019-10-16 time=14:00:00 format="LLLL" timezone=“America/New_York”]')
excerpt = PrettyText.excerpt(post.cooked, 200) excerpt = PrettyText.excerpt(post.cooked, 200)
expect(excerpt).to eq('Wednesday, October 16, 2019 6:00 PM (UTC)') expect(excerpt).to eq('Wednesday, October 16, 2019 6:00 PM (UTC)')
end end