Fix: Remove unwanted leading/trailing whitespaces in attributions (#4066

)
WordPress · Apr 11, 2024 · 12e5b9d · 12e5b9d
1 parent 68f3a7a
commit 12e5b9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/frontend/src/components/VMediaInfo/VCopyLicense.vue b/frontend/src/components/VMediaInfo/VCopyLicense.vue
@@ -28,16 +28,16 @@
         :media-id="media.id"
         :media-type="media.frontendMediaType"
       >
-        <p id="attribution-html" class="break-all font-mono" dir="ltr">
-          {{ getAttributionMarkup() }}
-        </p>
+        <!-- Ignore reason: the interpolated string cannot have any whitespace around it when inside <p>, else there will be unwanted whitespace -->
+        <!-- prettier-ignore -->
+        <p id="attribution-html" class="break-all font-mono" dir="ltr">{{ getAttributionMarkup() }}</p>
       </VLicenseTabPanel>
       <VLicenseTabPanel
         :tab="tabs[2]"
         :media-id="media.id"
         :media-type="media.frontendMediaType"
       >
-        {{ getAttributionMarkup({ isPlaintext: true }) }}
+        <p>{{ getAttributionMarkup({ isPlaintext: true }) }}</p>
       </VLicenseTabPanel>
     </VTabs>
   </div>

diff --git a/frontend/src/utils/attribution-html.ts b/frontend/src/utils/attribution-html.ts
@@ -244,7 +244,9 @@ export const getAttribution = (
     })
   }
 
-  const attribution = tFn("text", attributionParts).replace(/\s{2}/g, " ")
+  const attribution = tFn("text", attributionParts)
+    .replace(/\s{2}/g, " ")
+    .trim()
 
   return isPlaintext
     ? attribution