Merge branch 'hotfix/1.5.11'

terminal42 · Feb 12, 2020 · cdbc057 · cdbc057
2 parents 6796eff + 902b62f
commit cdbc057
Show file tree

Hide file tree

Showing 12 changed files with 1,438 additions and 32 deletions.
diff --git a/.tx/config b/.tx/config
@@ -3,46 +3,47 @@ host = https://www.transifex.com
 type = XLIFF
 
 [notification_center.master-notification_center-modules]
+file_filter = languages/<lang>/modules.xlf
 source_file = languages/en/modules.xlf
 source_lang = en
-file_filter = languages/<lang>/modules.xlf
 
 [notification_center.master-notification_center-tl_form]
+file_filter = languages/<lang>/tl_form.xlf
 source_file = languages/en/tl_form.xlf
 source_lang = en
-file_filter = languages/<lang>/tl_form.xlf
 
 [notification_center.master-notification_center-tl_module]
+file_filter = languages/<lang>/tl_module.xlf
 source_file = languages/en/tl_module.xlf
 source_lang = en
-file_filter = languages/<lang>/tl_module.xlf
 
 [notification_center.master-notification_center-tl_nc_gateway]
+file_filter = languages/<lang>/tl_nc_gateway.xlf
 source_file = languages/en/tl_nc_gateway.xlf
 source_lang = en
-file_filter = languages/<lang>/tl_nc_gateway.xlf
 
 [notification_center.master-notification_center-tl_nc_language]
+file_filter = languages/<lang>/tl_nc_language.xlf
 source_file = languages/en/tl_nc_language.xlf
 source_lang = en
-file_filter = languages/<lang>/tl_nc_language.xlf
 
 [notification_center.master-notification_center-tl_nc_message]
+file_filter = languages/<lang>/tl_nc_message.xlf
 source_file = languages/en/tl_nc_message.xlf
 source_lang = en
-file_filter = languages/<lang>/tl_nc_message.xlf
 
 [notification_center.master-notification_center-tl_nc_notification]
+file_filter = languages/<lang>/tl_nc_notification.xlf
 source_file = languages/en/tl_nc_notification.xlf
 source_lang = en
-file_filter = languages/<lang>/tl_nc_notification.xlf
 
 [notification_center.master-notification_center-tl_nc_queue]
+file_filter = languages/<lang>/tl_nc_queue.xlf
 source_file = languages/en/tl_nc_queue.xlf
 source_lang = en
-file_filter = languages/<lang>/tl_nc_queue.xlf
 
 [notification_center.master-notification_center-tokens]
+file_filter = languages/<lang>/tokens.xlf
 source_file = languages/en/tokens.xlf
 source_lang = en
-file_filter = languages/<lang>/tokens.xlf
+
diff --git a/README.md b/README.md
@@ -92,27 +92,8 @@ class MyHook
 
 ## Note to self
 
-Updating language files:
+Managing translations files.
 
-Generating the `en` base folder:
-```
-$ ./vendor/bin/ctb to-xliff 
-```
-
-Pushing `en` to transifex:
-
-```
-$ ./vendor/bin/ctb download-transifex en
-```
-
-Downloading translations:
+1. Install transifex client.
 
-```
-$ ./vendor/bin/ctb download-transifex --mode=translated
-```
-
-Storing the language files:
-
-```
-$ ./vendor/bin/ctb from-xliff
-```
+2.  `tx pull -a` to fetch updated translations.
diff --git a/config/runonce.php b/config/runonce.php
@@ -8,7 +8,7 @@
  * @license    LGPL
  */
 
-if (\Database::getInstance()->fieldExists('file_override', 'tl_nc_language')) {
+if (\Database::getInstance()->tableExists('tl_nc_language') && \Database::getInstance()->fieldExists('file_override', 'tl_nc_language')) {
     \Database::getInstance()->execute("ALTER TABLE tl_nc_language CHANGE file_override file_storage_mode varchar(8) NOT NULL default ''");
     \Database::getInstance()->execute("UPDATE tl_nc_language SET file_storage_mode='override' WHERE file_storage_mode!=''");
 }
diff --git a/languages/ja/modules.xlf b/languages/ja/modules.xlf
@@ -0,0 +1,81 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2018-10-22T10:57:28+02:00" original="modules" source-language="en" target-language="ja">
+    <body>
+      <trans-unit id="MOD.notification_center">
+        <source>Notification Center</source>
+        <target>通知センター</target>
+
+      </trans-unit>
+      <trans-unit id="MOD.nc_notifications.0">
+        <source>Notifications</source>
+        <target>通知</target>
+
+      </trans-unit>
+      <trans-unit id="MOD.nc_notifications.1">
+        <source>Manage notifications.</source>
+        <target>通知を管理</target>
+
+      </trans-unit>
+      <trans-unit id="MOD.nc_queue.0">
+        <source>Queue</source>
+        <target>キュー</target>
+
+      </trans-unit>
+      <trans-unit id="MOD.nc_queue.1">
+        <source>View the message queue.</source>
+        <target>メッセージキューを表示</target>
+
+      </trans-unit>
+      <trans-unit id="MOD.nc_gateways.0">
+        <source>Gateways</source>
+        <target>ゲートウェイ</target>
+
+      </trans-unit>
+      <trans-unit id="MOD.nc_gateways.1">
+        <source>Manage gateways</source>
+        <target>ゲートウェイを管理</target>
+
+      </trans-unit>
+      <trans-unit id="FMD.lostPasswordNotificationCenter.0">
+        <source>Lost password (Notification Center)</source>
+        <target>パスワード忘れ(通知センター)</target>
+
+      </trans-unit>
+      <trans-unit id="FMD.lostPasswordNotificationCenter.1">
+        <source>Generates a form to request a new password and sends the notification using the notification center.</source>
+        <target>通知センターを使用して新しいパスワードの要求と通知の送信を行うフォームを生成します。</target>
+
+      </trans-unit>
+      <trans-unit id="FMD.newsletterSubscribeNotificationCenter.0">
+        <source>Subscribe (Notification Center)</source>
+        <target>登録の申し込み(通知センター)</target>
+
+      </trans-unit>
+      <trans-unit id="FMD.newsletterSubscribeNotificationCenter.1">
+        <source>Generates a form to subscribe to one or more channels and sends the notification using the notification center.</source>
+        <target>通知センターを使用して1つ以上のチャネルの登録と通知の送信を行うフォームを生成します。</target>
+
+      </trans-unit>
+      <trans-unit id="FMD.newsletterActivateNotificationCenter.0">
+        <source>Activate (Notification Center)</source>
+        <target>アクティベーション(通知センター)</target>
+
+      </trans-unit>
+      <trans-unit id="FMD.newsletterActivateNotificationCenter.1">
+        <source>Generates a form to activate subscription to one or more channels the notification using the notification center.</source>
+        <target>通知センターを使用して1つ以上のチャネルのアクティベーションと通知の送信を行うフォームを生成します。</target>
+
+      </trans-unit>
+      <trans-unit id="FMD.newsletterUnsubscribeNotificationCenter.0">
+        <source>Unsubscribe (Notification Center)</source>
+        <target>解除の申し込み(通知センター)</target>
+
+      </trans-unit>
+      <trans-unit id="FMD.newsletterUnsubscribeNotificationCenter.1">
+        <source>Generates a form to unsubscribe from one or more channels and sends the notification using the notification center.</source>
+        <target>通知センターを使用して1つ以上のチャネルの登録の解除と通知の送信を行うフォームを生成します。</target>
+
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/languages/ja/tl_form.xlf b/languages/ja/tl_form.xlf
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2016-10-03T15:22:43+02:00" original="tl_form" source-language="en" target-language="ja">
+    <body>
+      <trans-unit id="tl_form.nc_notification.0">
+        <source>Notification</source>
+        <target>通知</target>
+
+      </trans-unit>
+      <trans-unit id="tl_form.nc_notification.1">
+        <source>Please select a notification.</source>
+        <target>通知を選択してください。</target>
+
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/languages/ja/tl_module.xlf b/languages/ja/tl_module.xlf
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2018-10-22T10:57:28+02:00" original="tl_module" source-language="en" target-language="ja">
+    <body>
+      <trans-unit id="tl_module.nc_notification.0">
+        <source>Notification</source>
+        <target>通知</target>
+
+      </trans-unit>
+      <trans-unit id="tl_module.nc_notification.1">
+        <source>Please select a notification.</source>
+        <target>通知を選択してください。</target>
+
+      </trans-unit>
+      <trans-unit id="tl_module.nc_activation_notification.0">
+        <source>Activation notification</source>
+        <target>アクティベーションの通知</target>
+
+      </trans-unit>
+      <trans-unit id="tl_module.nc_activation_notification.1">
+        <source>Please select an activation notification.</source>
+        <target>アクティベーションの通知を選択してください。</target>
+
+      </trans-unit>
+      <trans-unit id="tl_module.notification_legend">
+        <source>Notification</source>
+        <target>通知</target>
+
+      </trans-unit>
+    </body>
+  </file>
+</xliff>