Fixes #1835 - LTR texts in an RTL profile is RTLed sometimes

zammad · Aug 24, 2023 · 1c309d5 · 1c309d5
1 parent 0c727cb
commit 1c309d5
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/app/assets/javascripts/app/views/generic/richtext.jst.eco b/app/assets/javascripts/app/views/generic/richtext.jst.eco
@@ -11,5 +11,5 @@
       <% end %>
     </div>
 	<% end %>
-  <div contenteditable="<%= !@attribute.disabled %>" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="richtext-content <%= @attribute.class %>"><%- @attribute.value %></div>
+  <div contenteditable="<%= !@attribute.disabled %>" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="richtext-content <%= @attribute.class %>" dir="auto"><%- @attribute.value %></div>
 </div>
diff --git a/app/assets/javascripts/app/views/knowledge_base/reader.jst.eco b/app/assets/javascripts/app/views/knowledge_base/reader.jst.eco
@@ -13,7 +13,7 @@
     <small class="knowledge-base-article-meta js-answer-meta"></small>
 
     <div class="knowledge-base-article-body">
-      <div class="knowledge-base-article-content richtext-content js-answer-body"></div>
+      <div class="knowledge-base-article-content richtext-content js-answer-body" dir="auto"></div>
       <div class="knowledge-base-article-attachments js-answer-attachments"></div>
       <div class="knowledge-base-article-linked-tickets js-answer-linked-tickets"></div>
       <div class="knowledge-base-article-tags js-answer-tags"></div>

diff --git a/app/assets/javascripts/app/views/maintenance.jst.eco b/app/assets/javascripts/app/views/maintenance.jst.eco
@@ -41,7 +41,7 @@
       <div class="form-group">
         <label for="maintenance-message"><%- @T('Message') %></label>
         <div class="controls">
-          <div contenteditable="true" id="maintenance-message" data-name="message" class="form-control form-control--multiline js-textarea richtext-content"></div>
+          <div contenteditable="true" id="maintenance-message" data-name="message" class="form-control form-control--multiline js-textarea richtext-content" dir="auto"></div>
         </div>
       </div>
       <div class="form-group">

diff --git a/app/assets/javascripts/app/views/ticket_shared_draft_modal.jst.eco b/app/assets/javascripts/app/views/ticket_shared_draft_modal.jst.eco
@@ -1,14 +1,14 @@
 <div style="display:flex">
   <div style="margin-right: 5em">
-    <label>Author</label>
+    <label><%- @T('Author') %></label>
     <div style="display: flex; align-items: center;">
       <span class="js-avatar" style="margin-right: 0.5em"></span>
       <%= @name %>
     </div>
   </div>
 
   <div>
-    <label>Last changed</label>
+    <label><%- @T('Last changed') %></label>
     <div>
       <%- @humanTime(@timestamp) %>
     </div>
@@ -17,7 +17,7 @@
 
 <hr>
 
-<label>Text</label>
-<div class='richtext-content'>
+<label><%- @T('Text') %></label>
+<div class="richtext-content" dir="auto">
   <%- @body %>
 </div>
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
@@ -81,7 +81,7 @@
 
       <div class="textBubble js-writeArea">
         <div class="bubble-arrow"></div>
-        <div class="js-textarea richtext-content articleNewEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div>
+        <div class="js-textarea richtext-content articleNewEdit-body" dir="auto" contenteditable="true" data-name="body"><%- @article.body %></div>
         <!-- .textBubble grows with textarea (and expanding clone) -->
         <div class="textBubble-footer js-textSizeLimit">
           <div class="textBubble-signatur"><span class="js-signature"></span></div>

diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
@@ -87,7 +87,7 @@
       <div class="textBubble">
         <div class="bubble-arrow"></div>
         <div class="textBubble-content" id="article-content-<%= @article.id %>" data-id="<%= @article.id %>">
-          <div class="richtext-content"><%- @article.html %></div>
+          <div class="richtext-content" dir="auto"><%- @article.html %></div>
           <div class="textBubble-overflowContainer hide">
             <div class="btn btn--text js-toggleFold"><%- @T('See more') %></div>
           </div>

diff --git a/app/views/knowledge_base/public/answers/show.html.erb b/app/views/knowledge_base/public/answers/show.html.erb
@@ -7,7 +7,7 @@ data-available-locales='<%= @object_locales.map(&:locale).join(',') %>'>
         <%= @object.translation.title %>
       </h1>
 
-      <div class="article-content">
+      <div class="article-content" dir="auto">
         <%= prepare_rich_text(@object.translation.content.body_with_urls).html_safe %>
       </div>
 

diff --git a/i18n/zammad.pot b/i18n/zammad.pot
@@ -1484,6 +1484,10 @@ msgstr ""
 msgid "Authentication via %s"
 msgstr ""
 
+#: app/assets/javascripts/app/views/ticket_shared_draft_modal.jst.eco
+msgid "Author"
+msgstr ""
+
 #: app/controllers/application_controller/handles_errors.rb
 msgid "Authorization failed"
 msgstr ""
@@ -6360,6 +6364,10 @@ msgstr ""
 msgid "Last change %s %s by %s"
 msgstr ""
 
+#: app/assets/javascripts/app/views/ticket_shared_draft_modal.jst.eco
+msgid "Last changed"
+msgstr ""
+
 #: app/assets/javascripts/app/models/ticket.coffee
 #: app/graphql/gql/types/overview_type.rb
 msgid "Last contact"
@@ -10272,6 +10280,7 @@ msgstr ""
 #: app/assets/javascripts/app/controllers/_ui_element/object_manager_attribute.coffee
 #: app/assets/javascripts/app/models/signature.coffee
 #: app/assets/javascripts/app/models/ticket_article.coffee
+#: app/assets/javascripts/app/views/ticket_shared_draft_modal.jst.eco
 #: db/seeds/object_manager_attributes.rb
 msgid "Text"
 msgstr ""