pages_core 3.11.0 → 3.11.1

data/app/javascript/components/Attachments/Attachment.jsx

@@ -8,7 +8,7 @@ import ToastStore from "../../stores/ToastStore";
 import { useDraggable } from "../drag";
 
 export default function Attachment(props) {
-  const { attributeName, draggable } = props;
+  const { attributeName, draggable, locales, locale } = props;
   const { record } = draggable;
   const { attachment, uploading } = record;
 
@@ -30,15 +30,15 @@ export default function Attachment(props) {
   };
 
   const description = () => {
-    if (attachment.description && attachment.description[props.locale]) {
-      return attachment.description[props.locale];
+    if (attachment.description && attachment.description[locale]) {
+      return attachment.description[locale];
     }
     return null;
   };
 
   const name = () => {
-    if (attachment.name && attachment.name[props.locale]) {
-      return attachment.name[props.locale];
+    if (attachment.name && attachment.name[locale]) {
+      return attachment.name[locale];
     }
     return null;
   };
@@ -48,8 +48,8 @@ export default function Attachment(props) {
     ModalStore.dispatch({
       type: "OPEN",
       payload: <AttachmentEditor attachment={attachment}
-                                 locale={props.locale}
-                                 locales={props.locales}
+                                 locale={locale}
+                                 locales={locales}
                                  onUpdate={props.onUpdate} />
     });
   };
@@ -64,6 +64,8 @@ export default function Attachment(props) {
 
   const icon = uploading ? "cloud-upload" : "paperclip";
 
+  const localeDir = (locales && locales[locale].dir) || "ltr";
+
   return (
     <div className={classes.join(" ")}
          {...listeners}>
@@ -100,7 +102,8 @@ export default function Attachment(props) {
         <a href={attachment.url}
            rel="noreferrer"
            target="_blank">{attachment.filename}</a>}
-       {!uploading && description() && <p>{description()}</p>}
+       {!uploading && description() &&
+        <p dir={localeDir}>{description()}</p>}
      </div>}
     </div>
   );

data/app/javascript/components/Attachments/AttachmentEditor.jsx

@@ -6,7 +6,7 @@ import ToastStore from "../../stores/ToastStore";
 import { putJson } from "../../lib/request";
 
 export default function AttachmentEditor(props) {
-  const { attachment } = props;
+  const { attachment, locales } = props;
 
   const [locale, setLocale] = useState(props.locale);
   const [localizations, setLocalizations] = useState({
@@ -45,19 +45,22 @@ export default function AttachmentEditor(props) {
     ModalStore.dispatch({ type: "CLOSE" });
   };
 
+  const inputDir = (locales && locales[locale].dir) || "ltr";
+
   return (
     <div className="attachment-editor">
       <form>
-        {props.locales && Object.keys(props.locales).length > 1 && (
+        {props.locales && Object.keys(locales).length > 1 && (
           <div className="field">
             <label>
               Locale
             </label>
             <select name="locale"
+                    value={locale}
                     onChange={e => setLocale(e.target.value)}>
-              {Object.keys(props.locales).map(key => (
+              {Object.keys(locales).map(key => (
                 <option key={`locale-${key}`} value={key}>
-                  {props.locales[key]}
+                  {locales[key].name}
                 </option>
               ))}
             </select>
@@ -67,6 +70,8 @@ export default function AttachmentEditor(props) {
           <label>Name</label>
           <input type="text"
                  className="name"
+                 lang={locale}
+                 dir={inputDir}
                  value={localizations.name[locale] || ""}
                  onChange={updateLocalization("name")} />
         </div>
@@ -74,6 +79,8 @@ export default function AttachmentEditor(props) {
           <label>Description</label>
           <textarea className="description"
                     value={localizations.description[locale] || ""}
+                    lang={locale}
+                    dir={inputDir}
                     onChange={updateLocalization("description")} />
         </div>
         <div className="field embed-code">

data/app/javascript/components/ImageEditor/Form.jsx

@@ -19,7 +19,7 @@ export default function Form(props) {
     props.setLocale(evt.target.value);
   };
 
-  const inputDir = locales[locale].dir || "ltr";
+  const inputDir = (locales && locales[locale].dir) || "ltr";
 
   return (
     <form>

data/app/views/admin/pages/_edit_files.html.erb

@@ -1,4 +1,4 @@
 <%= react_component("PageFiles",
                     locale: @locale,
-                    locales: PagesCore.config.locales,
+                    locales: locales_with_dir,
                     records: @page.files.map { |pf| Admin::PageFileResource.new(pf).to_hash }) %>

data/app/views/admin/pages/_edit_metadata.html.erb

@@ -1,6 +1,6 @@
 <div class="field">
   <% if f.object.pathable? %>
-    <%= labelled_field(f.text_field(:path_segment),
+    <%= labelled_field(f.text_field(:path_segment, dir: "ltr", lang: nil),
                        "Path segment",
                        description: "Only alpanumeric characters and dashes " \
                          "are allowed.") %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.11.1
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara