Merge branch 'release-1.8.3'

thingsym · Feb 28, 2022 · 0570c1c · 0570c1c
2 parents 209b5b8 + a20a12c
commit 0570c1c
Show file tree

Hide file tree

Showing 21 changed files with 395 additions and 285 deletions.
diff --git a/README.md b/README.md
@@ -407,6 +407,13 @@ Small patches and bug reports can be submitted a issue tracker in Github. Forkin
 
 ## Changelog
 
+* Version 1.8.3
+	* update japanese translation
+	* update pot
+	* add composer script
+	* change makepot from php script to wp cli
+	* change plugin initialization to plugins_loaded hook
+	* replace assert from assertEquals to assertSame
 * Version 1.8.2
 	* change requires at least to wordpress 4.9
 	* change requires to PHP 5.6

diff --git a/composer.json b/composer.json
@@ -30,8 +30,8 @@
       "@phpstan"
     ],
     "bats": "bats tests/cli",
-    "makepot:php": "php /usr/local/share/wp-i18n/makepot.php wp-plugin ../multi-device-switcher ../multi-device-switcher/languages/multi-device-switcher.pot",
     "makepot:wpcli": "wp i18n make-pot ./ ./languages/multi-device-switcher.pot --exclude=dist,bin,tests,node_modules,vendor",
+    "makemo:ja": "wp i18n make-mo languages/multi-device-switcher-ja.po languages/",
     "msgfmt:ja": "msgfmt languages/multi-device-switcher-ja.po -o languages/multi-device-switcher-ja.mo"
   }
 }
diff --git a/languages/multi-device-switcher-ja.mo b/languages/multi-device-switcher-ja.mo
diff --git a/languages/multi-device-switcher-ja.po b/languages/multi-device-switcher-ja.po
@@ -1,32 +1,53 @@
-# Copyright (C) 2021 Multi Device Switcher
-# This file is distributed under the same license as the Multi Device Switcher package.
+# Copyright (C) 2022 thingsym
+# This file is distributed under the GPL2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Multi Device Switcher 1.8.2n"
-"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/multi-device-"
-"switcher\n"
-"POT-Creation-Date: 2021-12-26 08:37:47+00:00\n"
+"Project-Id-Version: Multi Device Switcher 1.8.3\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/multi-device-switcher\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2021-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2022-02-28T07:21:41+00:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.5.0\n"
+"X-Domain: multi-device-switcher\n"
+
+#. Plugin Name of the plugin
+#: multi-device-switcher.php:755
+#: multi-device-switcher.php:756
+#: multi-device-switcher.php:939
+#: multi-device-switcher.php:1395
+msgid "Multi Device Switcher"
+msgstr "Multi Device Switcher"
+
+#. Plugin URI of the plugin
+msgid "https://github.com/thingsym/multi-device-switcher"
+msgstr "https://github.com/thingsym/multi-device-switcher"
+
+#. Description of the plugin
+msgid "This WordPress plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom)."
+msgstr "This WordPress plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom)."
 
-#: multi-device-switcher.php:532 multi-device-switcher.php:538
+#. Author of the plugin
+msgid "thingsym"
+msgstr "thingsym"
+
+#. Author URI of the plugin
+msgid "https://www.thingslabo.com/"
+msgstr "https://www.thingslabo.com/"
+
+#: multi-device-switcher.php:532
+#: multi-device-switcher.php:538
 msgid "Mobile"
 msgstr "モバイル"
 
-#: multi-device-switcher.php:532 multi-device-switcher.php:538
+#: multi-device-switcher.php:532
+#: multi-device-switcher.php:538
 msgid "PC"
 msgstr "PC"
 
-#. #-#-#-#-#  multi-device-switcher.pot (Multi Device Switcher 1.8.2)  #-#-#-#-#
-#. Plugin Name of the plugin/theme
-#: multi-device-switcher.php:755 multi-device-switcher.php:756
-#: multi-device-switcher.php:939 multi-device-switcher.php:1394
-msgid "Multi Device Switcher"
-msgstr "Multi Device Switcher"
 
 #: multi-device-switcher.php:801
 msgid "Settings"
@@ -40,143 +61,141 @@ msgstr "スポンサーになる"
 msgid "Theme"
 msgstr "テーマ"
 
-#: multi-device-switcher.php:963 multi-device-switcher.php:1385
+#: multi-device-switcher.php:963
+#: multi-device-switcher.php:1386
 msgid "Smart Phone Theme"
 msgstr "スマートフォン用テーマ"
 
-#: multi-device-switcher.php:972 multi-device-switcher.php:975
-#: multi-device-switcher.php:1005 multi-device-switcher.php:1008
-#: multi-device-switcher.php:1038 multi-device-switcher.php:1041
-#: multi-device-switcher.php:1071 multi-device-switcher.php:1074
-#: multi-device-switcher.php:1118 multi-device-switcher.php:1121
-#: multi-device-switcher.php:1375 multi-device-switcher.php:1430
+#: multi-device-switcher.php:972
+#: multi-device-switcher.php:975
+#: multi-device-switcher.php:1005
+#: multi-device-switcher.php:1008
+#: multi-device-switcher.php:1038
+#: multi-device-switcher.php:1041
+#: multi-device-switcher.php:1071
+#: multi-device-switcher.php:1074
+#: multi-device-switcher.php:1118
+#: multi-device-switcher.php:1121
+#: multi-device-switcher.php:1376
+#: multi-device-switcher.php:1431
 msgid "None"
 msgstr "なし"
 
-#: multi-device-switcher.php:997 multi-device-switcher.php:1386
+#: multi-device-switcher.php:997
+#: multi-device-switcher.php:1387
 msgid "Tablet PC Theme"
 msgstr "タブレット端末用テーマ"
 
-#: multi-device-switcher.php:1030 multi-device-switcher.php:1387
+#: multi-device-switcher.php:1030
+#: multi-device-switcher.php:1388
 msgid "Mobile Phone Theme"
 msgstr "携帯モバイル端末用テーマ"
 
-#: multi-device-switcher.php:1063 multi-device-switcher.php:1388
+#: multi-device-switcher.php:1063
+#: multi-device-switcher.php:1389
 msgid "Game Platforms Theme"
 msgstr "ゲームプラットフォーム用テーマ"
 
 #: multi-device-switcher.php:1098
 msgid "Custom Switcher Theme"
 msgstr "Custom Switcher用テーマ"
 
-#: multi-device-switcher.php:1136
+#. translators: confirm: 1: custom switcher name
+#: multi-device-switcher.php:1137
 msgid "Delete"
 msgstr "削除"
 
-#: multi-device-switcher.php:1136
+#. translators: confirm: 1: custom switcher name
+#: multi-device-switcher.php:1137
 msgid "Are you sure you want to delete %1$s ?"
 msgstr "%1$s を削除してよろしいですか?"
 
-#: multi-device-switcher.php:1148 multi-device-switcher.php:1150
+#: multi-device-switcher.php:1149
+#: multi-device-switcher.php:1151
 msgid "Add Custom Switcher"
 msgstr "Custom Switcher を追加"
 
-#: multi-device-switcher.php:1152
+#: multi-device-switcher.php:1153
 msgid "Add"
 msgstr "追加"
 
-#: multi-device-switcher.php:1153
+#: multi-device-switcher.php:1154
 msgid "20 characters max, alphanumeric"
 msgstr "半角英数字 20 文字以内"
 
-#: multi-device-switcher.php:1161
+#: multi-device-switcher.php:1162
 msgid "UserAgent"
 msgstr "ユーザーエージェント"
 
-#: multi-device-switcher.php:1162
+#: multi-device-switcher.php:1163
 msgid "Enter Comma-separated values (csv) format."
 msgstr "csv 形式で入力してください。"
 
-#: multi-device-switcher.php:1165
+#: multi-device-switcher.php:1166
 msgid "Smart Phone"
 msgstr "スマートフォン"
 
-#: multi-device-switcher.php:1168
+#: multi-device-switcher.php:1169
 msgid "Tablet PC"
 msgstr "タブレット端末"
 
-#: multi-device-switcher.php:1171
+#: multi-device-switcher.php:1172
 msgid "Mobile Phone"
 msgstr "携帯モバイル端末"
 
-#: multi-device-switcher.php:1174
+#: multi-device-switcher.php:1175
 msgid "Game Platforms"
 msgstr "ゲームプラットフォーム"
 
-#: multi-device-switcher.php:1178
+#: multi-device-switcher.php:1179
 msgid "Reset Settings to Default UserAgent"
 msgstr "ユーザーエージェントをデフォルトにもどす"
 
-#: multi-device-switcher.php:1183
+#: multi-device-switcher.php:1184
 msgid "Custom Switcher UserAgent"
 msgstr "Custom Switcher用ユーザーエージェント"
 
-#: multi-device-switcher.php:1205 pc-switcher-widget.php:57
+#: multi-device-switcher.php:1206
+#: pc-switcher-widget.php:57
 msgid "PC Switcher"
 msgstr "PC Switcher"
 
-#: multi-device-switcher.php:1208 multi-device-switcher.php:1210
+#: multi-device-switcher.php:1209
+#: multi-device-switcher.php:1211
 msgid "Add PC Switcher"
 msgstr "PC Switcher を追加"
 
-#: multi-device-switcher.php:1211
+#: multi-device-switcher.php:1212
 msgid "Add a PC Switcher to the footer."
 msgstr "PC Switcher をフッターに追加する"
 
-#: multi-device-switcher.php:1214 multi-device-switcher.php:1216
+#: multi-device-switcher.php:1215
+#: multi-device-switcher.php:1217
 msgid "Add default CSS"
 msgstr "デフォルトCSSを追加"
 
-#: multi-device-switcher.php:1217
+#: multi-device-switcher.php:1218
 msgid "Add a default CSS."
 msgstr "デフォルトCSSを追加"
 
-#: multi-device-switcher.php:1224
+#: multi-device-switcher.php:1225
 msgid "Disable Switcher"
 msgstr "切り替え無効"
 
-#: multi-device-switcher.php:1227 multi-device-switcher.php:1229
+#: multi-device-switcher.php:1228
+#: multi-device-switcher.php:1230
 msgid "Path"
 msgstr "パス"
 
-#: multi-device-switcher.php:1234 multi-device-switcher.php:1236
+#: multi-device-switcher.php:1235
+#: multi-device-switcher.php:1237
 msgid "Regex mode"
 msgstr "正規表現モード"
 
-#: multi-device-switcher.php:1237
+#: multi-device-switcher.php:1238
 msgid "Enable Regex"
 msgstr "正規表現を有効化"
 
 #: pc-switcher-widget.php:54
 msgid "Add the PC Switcher to a widget."
 msgstr "PC Switcher をウィジェットに追加"
-
-#. Plugin URI of the plugin/theme
-msgid "https://github.com/thingsym/multi-device-switcher"
-msgstr "https://github.com/thingsym/multi-device-switcher"
-
-#. Description of the plugin/theme
-msgid ""
-"This WordPress plugin allows you to set a separate theme for device (Smart "
-"Phone, Tablet PC, Mobile Phone, Game and custom)."
-msgstr ""
-"This WordPress plugin allows you to set a separate theme for device (Smart "
-"Phone, Tablet PC, Mobile Phone, Game and custom)."
-
-#. Author of the plugin/theme
-msgid "thingsym"
-msgstr "thingsym"
-
-#. Author URI of the plugin/theme
-msgid "https://www.thingslabo.com/"
-msgstr "https://www.thingslabo.com/"