Merge branch '2.9' into 2

silverstripe · Aug 22, 2023 · f315bfd · f315bfd
2 parents aa1f084 + bfeb2bd
commit f315bfd
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 21 deletions.
diff --git a/client/lang/en.js b/client/lang/en.js
@@ -6,11 +6,11 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('en', {
-    "ShareDraftContent.LOADING": "Loading...",
-    "ShareDraftContent.FETCH_ERROR": "There was a problem generating the shareable link!",
     "ShareDraftContent.DESCRIPTION": "Anyone with this link can view the draft version of this page.",
+    "ShareDraftContent.FETCH_ERROR": "There was a problem generating the shareable link!",
     "ShareDraftContent.LEARN_MORE": "Learn more",
     "ShareDraftContent.LINK_HELP": "Link to share draft content",
+    "ShareDraftContent.LOADING": "Loading...",
     "ShareDraftContent.SHARE": "Share",
     "ShareDraftContent.SHARE_DRAFT_CONTENT": "Share draft content"
 });

diff --git a/client/lang/eo.js b/client/lang/eo.js
@@ -6,11 +6,11 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('eo', {
-    "ShareDraftContent.LOADING": "Ŝargas...",
-    "ShareDraftContent.FETCH_ERROR": "Okazis problemo generi la komunan ligilon!",
     "ShareDraftContent.DESCRIPTION": "Kiu havas ĉi tiun ligilon, tiu povas vidi la malnetan version de ĉi tiu paĝo.",
+    "ShareDraftContent.FETCH_ERROR": "Okazis problemo generi la komunan ligilon!",
     "ShareDraftContent.LEARN_MORE": "Lerni plu",
     "ShareDraftContent.LINK_HELP": "Ligi por kunhavi malnetan enhavon",
+    "ShareDraftContent.LOADING": "Ŝargas...",
     "ShareDraftContent.SHARE": "Kunhavigi",
     "ShareDraftContent.SHARE_DRAFT_CONTENT": "Kunhavigi malnetan enhavon"
 });

diff --git a/client/lang/sl.js b/client/lang/sl.js
@@ -6,11 +6,11 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('sl', {
-    "ShareDraftContent.LOADING": "Nalagam ...",
-    "ShareDraftContent.FETCH_ERROR": "Pri generiranju povezave je prišlo do napake.",
     "ShareDraftContent.DESCRIPTION": "Vsak, ki ima to povezavo, lahko dostopa do osnutka te strani.",
+    "ShareDraftContent.FETCH_ERROR": "Pri generiranju povezave je prišlo do napake.",
     "ShareDraftContent.LEARN_MORE": "Več o tem",
     "ShareDraftContent.LINK_HELP": "Povezava do osnutka strani",
+    "ShareDraftContent.LOADING": "Nalagam ...",
     "ShareDraftContent.SHARE": "Posreduj",
     "ShareDraftContent.SHARE_DRAFT_CONTENT": "Posredujte osnutek strani"
 });

diff --git a/client/lang/src/en.json b/client/lang/src/en.json
@@ -1,9 +1,9 @@
 {
-    "ShareDraftContent.LOADING": "Loading...",
-    "ShareDraftContent.FETCH_ERROR": "There was a problem generating the shareable link!",
     "ShareDraftContent.DESCRIPTION": "Anyone with this link can view the draft version of this page.",
+    "ShareDraftContent.FETCH_ERROR": "There was a problem generating the shareable link!",
     "ShareDraftContent.LEARN_MORE": "Learn more",
     "ShareDraftContent.LINK_HELP": "Link to share draft content",
+    "ShareDraftContent.LOADING": "Loading...",
     "ShareDraftContent.SHARE": "Share",
     "ShareDraftContent.SHARE_DRAFT_CONTENT": "Share draft content"
 }
diff --git a/client/lang/src/eo.json b/client/lang/src/eo.json
@@ -1,9 +1,9 @@
 {
-    "ShareDraftContent.LOADING": "Ŝargas...",
-    "ShareDraftContent.FETCH_ERROR": "Okazis problemo generi la komunan ligilon!",
     "ShareDraftContent.DESCRIPTION": "Kiu havas ĉi tiun ligilon, tiu povas vidi la malnetan version de ĉi tiu paĝo.",
+    "ShareDraftContent.FETCH_ERROR": "Okazis problemo generi la komunan ligilon!",
     "ShareDraftContent.LEARN_MORE": "Lerni plu",
     "ShareDraftContent.LINK_HELP": "Ligi por kunhavi malnetan enhavon",
+    "ShareDraftContent.LOADING": "Ŝargas...",
     "ShareDraftContent.SHARE": "Kunhavigi",
     "ShareDraftContent.SHARE_DRAFT_CONTENT": "Kunhavigi malnetan enhavon"
 }
diff --git a/client/lang/src/sl.json b/client/lang/src/sl.json
@@ -1,9 +1,9 @@
 {
-    "ShareDraftContent.LOADING": "Nalagam ...",
-    "ShareDraftContent.FETCH_ERROR": "Pri generiranju povezave je prišlo do napake.",
     "ShareDraftContent.DESCRIPTION": "Vsak, ki ima to povezavo, lahko dostopa do osnutka te strani.",
+    "ShareDraftContent.FETCH_ERROR": "Pri generiranju povezave je prišlo do napake.",
     "ShareDraftContent.LEARN_MORE": "Več o tem",
     "ShareDraftContent.LINK_HELP": "Povezava do osnutka strani",
+    "ShareDraftContent.LOADING": "Nalagam ...",
     "ShareDraftContent.SHARE": "Posreduj",
     "ShareDraftContent.SHARE_DRAFT_CONTENT": "Posredujte osnutek strani"
 }
diff --git a/client/lang/src/sv.json b/client/lang/src/sv.json
@@ -1,9 +1,9 @@
 {
-    "ShareDraftContent.LOADING": "Laddar...",
-    "ShareDraftContent.FETCH_ERROR": "Det gick inte att generera den delbara länken!",
     "ShareDraftContent.DESCRIPTION": "Alla med den här länken kan se utkastversionen av den här sidan.",
+    "ShareDraftContent.FETCH_ERROR": "Det gick inte att generera den delbara länken!",
     "ShareDraftContent.LEARN_MORE": "Lär dig mer",
     "ShareDraftContent.LINK_HELP": "Länk för att dela utkast innehåll",
+    "ShareDraftContent.LOADING": "Laddar...",
     "ShareDraftContent.SHARE": "Dela",
     "ShareDraftContent.SHARE_DRAFT_CONTENT": "Dela innehåll i utkast"
 }
diff --git a/client/lang/sv.js b/client/lang/sv.js
@@ -6,11 +6,11 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('sv', {
-    "ShareDraftContent.LOADING": "Laddar...",
-    "ShareDraftContent.FETCH_ERROR": "Det gick inte att generera den delbara länken!",
     "ShareDraftContent.DESCRIPTION": "Alla med den här länken kan se utkastversionen av den här sidan.",
+    "ShareDraftContent.FETCH_ERROR": "Det gick inte att generera den delbara länken!",
     "ShareDraftContent.LEARN_MORE": "Lär dig mer",
     "ShareDraftContent.LINK_HELP": "Länk för att dela utkast innehåll",
+    "ShareDraftContent.LOADING": "Laddar...",
     "ShareDraftContent.SHARE": "Dela",
     "ShareDraftContent.SHARE_DRAFT_CONTENT": "Dela innehåll i utkast"
 });

diff --git a/lang/en.yml b/lang/en.yml
@@ -14,6 +14,9 @@ en:
     TOPBAR_HOW_IT_WORKS: 'How it works.'
     TOPBAR_PUBLISHED_DESC: 'contains content which has been published. As a result, you will not be notified of this, and will see the live version of the site.'
     TOPBAR_TWO_STATES: 'Pages appear in two states:'
+  SilverStripe\ShareDraftContent\Extensions\ShareDraftContentSiteTreeExtension:
+    db_ShareTokenSalt: 'Share token salt'
+    has_many_ShareTokens: 'Share tokens'
   SilverStripe\ShareDraftContent\Models\ShareToken:
     PLURALNAME: 'Share Tokens'
     PLURALS:
@@ -23,6 +26,3 @@ en:
     db_Token: Token
     db_ValidForDays: 'Valid for days'
     has_one_Page: Page
-  SilverStripe\ShareDraftContent\Extensions\ShareDraftContentSiteTreeExtension:
-    db_ShareTokenSalt: 'Share token salt'
-    has_many_ShareTokens: 'Share tokens'
diff --git a/lang/eo.yml b/lang/eo.yml
@@ -14,6 +14,9 @@ eo:
     TOPBAR_HOW_IT_WORKS: 'Kiel ĝi funkcias.'
     TOPBAR_PUBLISHED_DESC: 'tenas enhavon ankoraŭ ne publikigita. Pro tio, vi ne ricevos mesaĝon, kaj vi vidos la publikan version de la retejo.'
     TOPBAR_TWO_STATES: 'Paĝoj aperas en du statoj:'
+  SilverStripe\ShareDraftContent\Extensions\ShareDraftContentSiteTreeExtension:
+    db_ShareTokenSalt: 'Komuna ĵetona salo'
+    has_many_ShareTokens: 'Komunaj ĵetonoj'
   SilverStripe\ShareDraftContent\Models\ShareToken:
     PLURALNAME: 'Komunaj ĵetonoj'
     PLURALS:
@@ -22,3 +25,4 @@ eo:
     SINGULARNAME: 'Komuna ĵetono'
     db_Token: Ĵetono
     db_ValidForDays: 'Valida por tagoj'
+    has_one_Page: Paĝo
diff --git a/lang/sl.yml b/lang/sl.yml
@@ -17,10 +17,10 @@ sl:
   SilverStripe\ShareDraftContent\Models\ShareToken:
     PLURALNAME: Ključi
     PLURALS:
-      one: Ključ
-      two: '{count} ključa'
       few: '{count} ključev'
+      one: Ključ
       other: '{count} ključev'
+      two: '{count} ključa'
     SINGULARNAME: Ključ
     db_Token: Ključ
     db_ValidForDays: 'Veljavno (dni)'