Merge branch 'release-1.8.4'

thingsym · Nov 25, 2022 · 3b0bb50 · 3b0bb50
2 parents 9621368 + b81a2d3
commit 3b0bb50
Show file tree

Hide file tree

Showing 20 changed files with 566 additions and 192 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Introducing Multi Device Switcher
 
-This WordPress plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom).
+Multi Device Switcher plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom).
 This plugin detects if your site is being viewed by UserAgent, and switches to selected theme. The Custom Switcher can add every device.
 
 ## Features
@@ -379,34 +379,75 @@ turn on default CSS
 
     wp multi-device css on
 
-## Resources
-
-* [Developer Blog (Japanese) - http://blog.thingslabo.com/ ](https://blog.thingslabo.com/archives/category/multi_device_switcher)
-
 ## WordPress Plugin Directory
 
 Multi Device Switcher is hosted on the WordPress Plugin Directory.
 
 [https://wordpress.org/plugins/multi-device-switcher/](https://wordpress.org/plugins/multi-device-switcher/)
 
-## Test Matrix
+## Resources
 
-For operation compatibility between PHP version and WordPress version, see below [Github Actions](https://github.com/thingsym/multi-device-switcher/actions).
+* [Developer Blog (Japanese) - http://blog.thingslabo.com/ ](https://blog.thingslabo.com/archives/category/multi_device_switcher)
+
+## Support
+
+If you have any trouble, you can use the forums or report bugs.
+
+* Forum: [https://wordpress.org/support/plugin/multi-device-switcher/](https://wordpress.org/support/plugin/multi-device-switcher/)
+* Issues: [https://github.com/thingsym/multi-device-switcher/issues](https://github.com/thingsym/multi-device-switcher/issues)
 
 ## Contribution
 
+Small patches and bug reports can be submitted a issue tracker in Github.
+
+Translating a plugin takes a lot of time, effort, and patience. I really appreciate the hard work from these contributors.
+
+If you have created or updated your own language pack, you can send gettext PO and MO files to author. I can bundle it into plugin.
+
+* VCS - Github: [https://github.com/thingsym/multi-device-switcher/](https://github.com/thingsym/multi-device-switcher/)
+* [Translate Multi Device Switcher into your language.](https://translate.wordpress.org/projects/wp-plugins/multi-device-switcher)
+
+You can also contribute by answering issues on the forums.
+
+* Forum: [https://wordpress.org/support/plugin/multi-device-switcher/](https://wordpress.org/support/plugin/multi-device-switcher/)
+* Issues: [https://github.com/thingsym/multi-device-switcher/issues](https://github.com/thingsym/multi-device-switcher/issues)
+
 ### Patches and Bug Fixes
 
-Small patches and bug reports can be submitted a issue tracker in Github. Forking on Github is another good way. You can send a pull request.
+Forking on Github is another good way. You can send a pull request.
 
 1. Fork [Multi Device Switcher](https://github.com/thingsym/multi-device-switcher) from GitHub repository
 2. Create a feature branch: git checkout -b my-new-feature
 3. Commit your changes: git commit -am 'Add some feature'
 4. Push to the branch: git push origin my-new-feature
 5. Create new Pull Request
 
+### Contribute guidlines
+
+If you would like to contribute, here are some notes and guidlines.
+
+* All development happens on the **develop** branch, so it is always the most up-to-date
+* The **master** branch only contains tagged releases
+* If you are going to be submitting a pull request, please submit your pull request to the **develop** branch
+* See about [forking](https://help.github.com/articles/fork-a-repo/) and [pull requests](https://help.github.com/articles/using-pull-requests/)
+
+## Test Matrix
+
+For operation compatibility between PHP version and WordPress version, see below [Github Actions](https://github.com/thingsym/multi-device-switcher/actions).
+
 ## Changelog
 
+* Version 1.8.4
+	* tested up to 6.1.0
+	* update japanese translation
+	* update pot
+	* fix composer.json
+	* add test case
+	* update useragent
+	* fix load_textdomain method for testability
+	* add msgmerge to composer scripts
+	* add support section and enhance contribution section
+	* fix license
 * Version 1.8.3
 	* update japanese translation
 	* update pot

diff --git a/composer.json b/composer.json
@@ -1,6 +1,27 @@
 {
-  "description": "composer.json for testing WordPress theme/plugin",
-  "license": "GPL2 or later",
+  "name": "thingsym/multi-device-switcher",
+  "version": "1.8.4",
+  "description": "This WordPress plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom).",
+  "author": [
+    {
+        "name": "Thingsym",
+        "email": "",
+        "homepage": "https://github.com/thingsym/",
+        "role": "Developer"
+    }
+  ],
+  "license": "GPLv2 or later",
+  "homepage": "https://wordpress.org/plugins/multi-device-switcher/",
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/thingsym/multi-device-switcher"
+    }
+  ],
+  "support": {
+    "forum": "https://wordpress.org/support/plugin/multi-device-switcher/",
+    "issues": "https://github.com/thingsym/multi-device-switcher/issues"
+  },
   "require": {},
   "require-dev": {
     "squizlabs/php_codesniffer": "3.*",
@@ -31,6 +52,7 @@
     ],
     "bats": "bats tests/cli",
     "makepot:wpcli": "wp i18n make-pot ./ ./languages/multi-device-switcher.pot --exclude=dist,bin,tests,node_modules,vendor",
+    "msgmerge:ja": "msgmerge --update --backup off ./languages/multi-device-switcher-ja.po ./languages/multi-device-switcher.pot",
     "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,24 +1,24 @@
 # Copyright (C) 2022 thingsym
-# This file is distributed under the GPL2 or later.
+# This file is distributed under the GPLv2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Multi Device Switcher 1.8.3\n"
-"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/multi-device-switcher\n"
+"Project-Id-Version: Multi Device Switcher 1.8.4\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/multi-device-"
+"switcher\n"
+"POT-Creation-Date: 2022-11-25T10:39:41+00:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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
+#: multi-device-switcher.php:754 multi-device-switcher.php:755
+#: multi-device-switcher.php:938 multi-device-switcher.php:1394
 msgid "Multi Device Switcher"
 msgstr "Multi Device Switcher"
 
@@ -27,8 +27,12 @@ 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)."
+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
 msgid "thingsym"
@@ -38,161 +42,142 @@ msgstr "thingsym"
 msgid "https://www.thingslabo.com/"
 msgstr "https://www.thingslabo.com/"
 
-#: multi-device-switcher.php:532
-#: multi-device-switcher.php:538
+#: 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.php:801
+#: multi-device-switcher.php:800
 msgid "Settings"
 msgstr "設定"
 
-#: multi-device-switcher.php:826
+#: multi-device-switcher.php:825
 msgid "Become a sponsor"
 msgstr "スポンサーになる"
 
-#: multi-device-switcher.php:961
+#: multi-device-switcher.php:960
 msgid "Theme"
 msgstr "テーマ"
 
-#: multi-device-switcher.php:963
-#: multi-device-switcher.php:1386
+#: multi-device-switcher.php:962 multi-device-switcher.php:1385
 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:1376
-#: multi-device-switcher.php:1431
+#: multi-device-switcher.php:971 multi-device-switcher.php:974
+#: multi-device-switcher.php:1004 multi-device-switcher.php:1007
+#: multi-device-switcher.php:1037 multi-device-switcher.php:1040
+#: multi-device-switcher.php:1070 multi-device-switcher.php:1073
+#: multi-device-switcher.php:1117 multi-device-switcher.php:1120
+#: multi-device-switcher.php:1375 multi-device-switcher.php:1430
 msgid "None"
 msgstr "なし"
 
-#: multi-device-switcher.php:997
-#: multi-device-switcher.php:1387
+#: multi-device-switcher.php:996 multi-device-switcher.php:1386
 msgid "Tablet PC Theme"
 msgstr "タブレット端末用テーマ"
 
-#: multi-device-switcher.php:1030
-#: multi-device-switcher.php:1388
+#: multi-device-switcher.php:1029 multi-device-switcher.php:1387
 msgid "Mobile Phone Theme"
 msgstr "携帯モバイル端末用テーマ"
 
-#: multi-device-switcher.php:1063
-#: multi-device-switcher.php:1389
+#: multi-device-switcher.php:1062 multi-device-switcher.php:1388
 msgid "Game Platforms Theme"
 msgstr "ゲームプラットフォーム用テーマ"
 
-#: multi-device-switcher.php:1098
+#: multi-device-switcher.php:1097
 msgid "Custom Switcher Theme"
 msgstr "Custom Switcher用テーマ"
 
 #. translators: confirm: 1: custom switcher name
-#: multi-device-switcher.php:1137
+#: multi-device-switcher.php:1136
 msgid "Delete"
 msgstr "削除"
 
 #. translators: confirm: 1: custom switcher name
-#: multi-device-switcher.php:1137
+#: multi-device-switcher.php:1136
 msgid "Are you sure you want to delete %1$s ?"
 msgstr "%1$s を削除してよろしいですか?"
 
-#: multi-device-switcher.php:1149
-#: multi-device-switcher.php:1151
+#: multi-device-switcher.php:1148 multi-device-switcher.php:1150
 msgid "Add Custom Switcher"
 msgstr "Custom Switcher を追加"
 
-#: multi-device-switcher.php:1153
+#: multi-device-switcher.php:1152
 msgid "Add"
 msgstr "追加"
 
-#: multi-device-switcher.php:1154
+#: multi-device-switcher.php:1153
 msgid "20 characters max, alphanumeric"
 msgstr "半角英数字 20 文字以内"
 
-#: multi-device-switcher.php:1162
+#: multi-device-switcher.php:1161
 msgid "UserAgent"
 msgstr "ユーザーエージェント"
 
-#: multi-device-switcher.php:1163
+#: multi-device-switcher.php:1162
 msgid "Enter Comma-separated values (csv) format."
 msgstr "csv 形式で入力してください。"
 
-#: multi-device-switcher.php:1166
+#: multi-device-switcher.php:1165
 msgid "Smart Phone"
 msgstr "スマートフォン"
 
-#: multi-device-switcher.php:1169
+#: multi-device-switcher.php:1168
 msgid "Tablet PC"
 msgstr "タブレット端末"
 
-#: multi-device-switcher.php:1172
+#: multi-device-switcher.php:1171
 msgid "Mobile Phone"
 msgstr "携帯モバイル端末"
 
-#: multi-device-switcher.php:1175
+#: multi-device-switcher.php:1174
 msgid "Game Platforms"
 msgstr "ゲームプラットフォーム"
 
-#: multi-device-switcher.php:1179
+#: multi-device-switcher.php:1178
 msgid "Reset Settings to Default UserAgent"
 msgstr "ユーザーエージェントをデフォルトにもどす"
 
-#: multi-device-switcher.php:1184
+#: multi-device-switcher.php:1183
 msgid "Custom Switcher UserAgent"
 msgstr "Custom Switcher用ユーザーエージェント"
 
-#: multi-device-switcher.php:1206
-#: pc-switcher-widget.php:57
+#: multi-device-switcher.php:1205 pc-switcher-widget.php:57
 msgid "PC Switcher"
 msgstr "PC Switcher"
 
-#: multi-device-switcher.php:1209
-#: multi-device-switcher.php:1211
+#: multi-device-switcher.php:1208 multi-device-switcher.php:1210
 msgid "Add PC Switcher"
 msgstr "PC Switcher を追加"
 
-#: multi-device-switcher.php:1212
+#: multi-device-switcher.php:1211
 msgid "Add a PC Switcher to the footer."
 msgstr "PC Switcher をフッターに追加する"
 
-#: multi-device-switcher.php:1215
-#: multi-device-switcher.php:1217
+#: multi-device-switcher.php:1214 multi-device-switcher.php:1216
 msgid "Add default CSS"
 msgstr "デフォルトCSSを追加"
 
-#: multi-device-switcher.php:1218
+#: multi-device-switcher.php:1217
 msgid "Add a default CSS."
 msgstr "デフォルトCSSを追加"
 
-#: multi-device-switcher.php:1225
+#: multi-device-switcher.php:1224
 msgid "Disable Switcher"
 msgstr "切り替え無効"
 
-#: multi-device-switcher.php:1228
-#: multi-device-switcher.php:1230
+#: multi-device-switcher.php:1227 multi-device-switcher.php:1229
 msgid "Path"
 msgstr "パス"
 
-#: multi-device-switcher.php:1235
-#: multi-device-switcher.php:1237
+#: multi-device-switcher.php:1234 multi-device-switcher.php:1236
 msgid "Regex mode"
 msgstr "正規表現モード"
 
-#: multi-device-switcher.php:1238
+#: multi-device-switcher.php:1237
 msgid "Enable Regex"
 msgstr "正規表現を有効化"