1
0
Fork 1
forked from fedi/mastodon

Fix RTL detection on Ruby side (#3867)

This fixes below bugs:

* pipe characters being counted as RTL character
* only first word being checked
This commit is contained in:
unarist 2017-06-21 01:45:09 +09:00 committed by Eugen Rochko
parent da6fa029f6
commit b16b69350e
2 changed files with 6 additions and 6 deletions

View file

@ -53,11 +53,11 @@ module StreamEntriesHelper
def rtl?(text)
text = simplified_text(text)
rtl_characters = /[\p{Hebrew}|\p{Arabic}|\p{Syriac}|\p{Thaana}|\p{Nko}]+/m.match(text)
rtl_words = text.scan(/[\p{Hebrew}\p{Arabic}\p{Syriac}\p{Thaana}\p{Nko}]+/m)
if rtl_characters.present?
if rtl_words.present?
total_size = text.size.to_f
rtl_size(rtl_characters.to_a) / total_size > 0.3
rtl_size(rtl_words) / total_size > 0.3
else
false
end
@ -77,8 +77,8 @@ module StreamEntriesHelper
end
end
def rtl_size(characters)
characters.reduce(0) { |acc, elem| acc + elem.size }.to_f
def rtl_size(words)
words.reduce(0) { |acc, elem| acc + elem.size }.to_f
end
def embedded_view?

View file

@ -217,7 +217,7 @@ RSpec.describe StreamEntriesHelper, type: :helper do
end
it 'is true if right to left characters are greater than 1/3 of total text' do
expect(helper).to be_rtl 'aaݟ'
expect(helper).to be_rtl 'aaݟaaݟ'
end
end
end