Merge branch '1.8'

ezpublishlegacy · Feb 9, 2017 · 24658ee · 24658ee
2 parents f979a7f + 4ecb5b0
commit 24658ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Resources/public/templates/tabs/details.hbt b/Resources/public/templates/tabs/details.hbt
@@ -81,7 +81,7 @@
         in
         <select class="ez-subitems-sorting-order">
             <option {{#if isAscendingOrder}}selected{{/if}} value="ASC">{{ translate 'locationview.details.ascending' 'locationview' }}</option>
-            <option {{#unless isAscendingOrder}}selected{{/unless}} value="DESC">{{ translate 'locationview.details.desceding' 'locationview' }}</option>
+            <option {{#unless isAscendingOrder}}selected{{/unless}} value="DESC">{{ translate 'locationview.details.descending' 'locationview' }}</option>
         </select>
     </p>
 </div>
diff --git a/Resources/translations/locationview.en.xlf b/Resources/translations/locationview.en.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2017-02-03T12:03:13Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2017-02-03T15:42:16Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -180,6 +180,12 @@
         <note>key: locationview.details.default.listing.of.subitems.by</note>
         <jms:reference-file>Resources/public/templates/tabs/details.hbt</jms:reference-file>
       </trans-unit>
+      <trans-unit id="a8f82a516b76060775a7c40c5163cd4f2af7b8ac" resname="locationview.details.descending">
+        <source>Descending</source>
+        <target>Descending</target>
+        <note>key: locationview.details.descending</note>
+        <jms:reference-file>Resources/public/templates/tabs/details.hbt</jms:reference-file>
+      </trans-unit>
       <trans-unit id="5cc52ce2cc763622f266df9138b7e507cca2d7de" resname="locationview.details.errorcontributor">
         <source>An error occurred while loading the last contributor.</source>
         <target>An error occurred while loading the last contributor.</target>