- {{{topic.escapedExcerpt}}}
+ {{{dir-span topic.escapedExcerpt}}}
{{#if topic.excerptTruncated}}
{{i18n 'read_more'}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index d8dcac7040c..55c7e7ef849 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -5,7 +5,7 @@
{{#if category.uploaded_logo.url}}
{{cdn-img src=category.uploaded_logo.url class="category-logo"}}
{{#if category.description}}
-
{{{category.description}}}
+
{{{dir-span category.description}}}
{{/if}}
{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index 985fe9cd74a..85cdfd8f156 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -15,7 +15,7 @@
{{/if}}
{{#if shouldDisplayDescription}}
-
{{{description}}}
+
{{{dir-span description}}}
{{/if}}
{{else}}
{{{label}}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 0f716141286..2cfdb0e1d14 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1278,6 +1278,7 @@ en:
olist_title: "Numbered List"
ulist_title: "Bulleted List"
list_item: "List item"
+ toggle_direction: "Toggle Direction"
help: "Markdown Editing Help"
collapse: "minimize the composer panel"
abandon: "close composer and discard draft"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index c32b730f3fc..e1b45e517ca 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -968,6 +968,7 @@ en:
default_locale: "The default language of this Discourse instance"
allow_user_locale: "Allow users to choose their own language interface preference"
set_locale_from_accept_language_header: "set interface language for anonymous users from their web browser's language headers. (EXPERIMENTAL, does not work with anonymous cache)"
+ support_mixed_text_direction: "Support mixed left-to-right and right-to-left text directions."
min_post_length: "Minimum allowed post length in characters"
min_first_post_length: "Minimum allowed first post (topic body) length in characters"
min_personal_message_post_length: "Minimum allowed post length in characters for messages"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 51e324a3346..743560fb290 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -79,6 +79,9 @@ basic:
set_locale_from_accept_language_header:
default: false
validator: "AllowUserLocaleEnabledValidator"
+ support_mixed_text_direction:
+ client: true
+ default: false
categories_topics:
default: 20
min: 5
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index faf4f30b3b8..e0409e4957d 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -715,6 +715,26 @@ testCase(`list button with line sequence`, function(assert, textarea) {
});
});
+componentTest('clicking the toggle-direction button toggles the direction', {
+ template: '{{d-editor value=value}}',
+ beforeEach() {
+ this.siteSettings.support_mixed_text_direction = true;
+ this.siteSettings.default_locale = "en";
+ },
+
+ test(assert) {
+ const textarea = this.$('textarea.d-editor-input');
+ click('button.toggle-direction');
+ andThen(() => {
+ assert.equal(textarea.attr('dir'), 'rtl');
+ });
+ click('button.toggle-direction');
+ andThen(() => {
+ assert.equal(textarea.attr('dir'), 'ltr');
+ });
+ }
+});
+
testCase(`doesn't jump to bottom with long text`, function(assert, textarea) {
let longText = 'hello world.';
diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js.es6
index e18662c2ab9..7a2de69a5a2 100644
--- a/test/javascripts/components/text-field-test.js.es6
+++ b/test/javascripts/components/text-field-test.js.es6
@@ -22,3 +22,27 @@ componentTest("support a placeholder", {
assert.equal(this.$('input').prop('placeholder'), 'placeholder.i18n.key');
}
});
+
+componentTest("sets the dir attribute to ltr for Hebrew text", {
+ template: `{{text-field value='זהו שם עברי עם מקום עברי'}}`,
+ beforeEach() {
+ this.siteSettings.support_mixed_text_direction = true;
+ },
+
+ test(assert) {
+ assert.equal(this.$('input').attr('dir'), 'rtl');
+ }
+});
+
+componentTest("sets the dir attribute to ltr for English text", {
+ template: `{{text-field value='This is a ltr title'}}`,
+ beforeEach() {
+ this.siteSettings.support_mixed_text_direction = true;
+ },
+
+ test(assert) {
+ assert.equal(this.$('input').attr('dir'), 'ltr');
+ }
+});
+
+
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js.es6
index 17322d46191..5fdc807dec4 100644
--- a/test/javascripts/lib/category-badge-test.js.es6
+++ b/test/javascripts/lib/category-badge-test.js.es6
@@ -45,3 +45,28 @@ QUnit.test("allowUncategorized", assert => {
assert.blank(categoryBadgeHTML(uncategorized), "it doesn't return HTML for uncategorized by default");
assert.present(categoryBadgeHTML(uncategorized, {allowUncategorized: true}), "it returns HTML");
});
+
+QUnit.test("category names are wrapped in dir-spans", assert => {
+ Discourse.SiteSettings.support_mixed_text_direction = true;
+ const store = createStore();
+ const rtlCategory = store.createRecord('category', {
+ name: 'תכנות עם Ruby',
+ id: 123,
+ description_text: 'cool description',
+ color: 'ff0',
+ text_color: 'f00'
+ });
+
+ const ltrCategory = store.createRecord('category', {
+ name: 'Programming in Ruby',
+ id: 234
+ });
+
+ let tag = parseHTML(categoryBadgeHTML(rtlCategory))[0];
+ let dirSpan = tag.children[1].children[0];
+ assert.equal(dirSpan.attributes.dir, 'rtl');
+
+ tag = parseHTML(categoryBadgeHTML(ltrCategory))[0];
+ dirSpan = tag.children[1].children[0];
+ assert.equal(dirSpan.attributes.dir, 'ltr');
+});
diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js.es6
new file mode 100644
index 00000000000..c8ddee262b8
--- /dev/null
+++ b/test/javascripts/lib/text-direction-test.js.es6
@@ -0,0 +1,23 @@
+import { isRTL, isLTR } from 'discourse/lib/text-direction';
+
+QUnit.module('lib:text-direction');
+
+QUnit.test("isRTL", assert => {
+ // Hebrew
+ assert.equal(isRTL('זה מבחן'), true);
+
+ // Arabic
+ assert.equal(isRTL('هذا اختبار'), true);
+
+ // Persian
+ assert.equal(isRTL('این یک امتحان است'), true);
+
+ assert.equal(isRTL('This is a test'), false);
+ assert.equal(isRTL(''), false);
+});
+
+QUnit.test("isLTR", assert => {
+ assert.equal(isLTR('This is a test'), true);
+ assert.equal(isLTR('זה מבחן'), false);
+});
+
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js.es6
index 2e9ce444365..7c33bceff03 100644
--- a/test/javascripts/models/topic-test.js.es6
+++ b/test/javascripts/models/topic-test.js.es6
@@ -98,6 +98,15 @@ QUnit.test('fancyTitle', assert => {
"supports emojis");
});
+QUnit.test('fancyTitle direction', assert => {
+ const rtlTopic = Topic.create({ fancy_title: "هذا اختبار" });
+ const ltrTopic = Topic.create({ fancy_title: "This is a test"});
+
+ Discourse.SiteSettings.support_mixed_text_direction = true;
+ assert.equal(rtlTopic.get('fancyTitle'), `
هذا اختبار`, "sets the dir-span to rtl");
+ assert.equal(ltrTopic.get('fancyTitle'), `
This is a test`, "sets the dir-span to ltr");
+});
+
QUnit.test('excerpt', assert => {
const topic = Topic.create({ excerpt: "This is a test topic :smile:", pinned: true });