Merge branch 'deployment/production' into 'master'

アーカイブモジュールをインフォメーション専用アーカイブモジュールに変更

See merge request !24

-; Joomla! Project
-; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-MOD_ARTICLES_ARCHIVE_CUSTOM="Articles - Archived - custom"
-MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL="# of Months"
-MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC="The number of months to display (the default is 10)."
-MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="Display a list of calendar months, including published articles. This list is automatically generated when you create a published article."
-MOD_ARTICLES_ARCHIVE_CUSTOM_DATE="%1$s, %2$s"
\ No newline at end of file

-; Joomla! Project
-; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-MOD_ARTICLES_ARCHIVE_CUSTOM="Articles - Archived - custom"
-MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="Display a list of calendar months, including published articles. This list is automatically generated when you create a published article."
-MOD_ARTICLES_ARCHIVE_CUSTOM_LAYOUT_DEFAULT="Default"
\ No newline at end of file

+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM="InformationArticles - Archived - custom"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL="# of Months"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC="The number of months to display (the default is 10)."
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="Display a list of calendar months, including published articles. This list is automatically generated when you create a published article."
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_DATE="%1$s, %2$s"
\ No newline at end of file

+; Joomla! Project
+; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM="InformationArticles - Archived - custom"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="Display a list of calendar months, including published articles. This list is automatically generated when you create a published article."
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_LAYOUT_DEFAULT="Default"
\ No newline at end of file

-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-MOD_ARTICLES_ARCHIVE_CUSTOM="カスタムアーカイブ(モジュール)"
-MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL="表示月数"
-MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC="表示する月数（標準は10）です。"
-MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="公開状態になっている記事を含むカレンダー月の一覧を表示します。公開状態になっている記事を作成すると、この一覧は自動的に生成されます。"
-MOD_ARTICLES_ARCHIVE_CUSTOM_DATE="%1$s, %2$s"
\ No newline at end of file

-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-MOD_ARTICLES_ARCHIVE_CUSTOM="カスタムアーカイブ(モジュール)"
-MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="公開状態になっている記事を含むカレンダー月の一覧を表示します。公開状態になっている記事を作成すると、この一覧は自動的に生成されます。"
-MOD_ARTICLES_ARCHIVE_CUSTOM_LAYOUT_DEFAULT="標準"
\ No newline at end of file

+; Joomla! Project
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM="カスタムインフォメーションアーカイブ(モジュール)"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL="表示月数"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC="表示する月数（標準は10）です。"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="公開状態になっている記事を含むカレンダー月の一覧を表示します。公開状態になっている記事を作成すると、この一覧は自動的に生成されます。"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_DATE="%1$s, %2$s"
\ No newline at end of file

+; Joomla! Project
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM="カスタムインフォメーションアーカイブ(モジュール)"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION="公開状態になっている記事を含むカレンダー月の一覧を表示します。公開状態になっている記事を作成すると、この一覧は自動的に生成されます。"
+MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_LAYOUT_DEFAULT="標準"
\ No newline at end of file

 <?php
 <?php
 /**
 /**
  * @package     Joomla.Site
  * @package     Joomla.Site
- * @subpackage  mod_articles_archive
+ * @subpackage  mod_information_articles_archive_custom
  *
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 defined('_JEXEC') or die;
 
 
 /**
 /**
- * Helper for mod_articles_archive
+ * Helper for mod_information_articles_archive_custom
  *
  *
  * @since  1.5
  * @since  1.5
  */
  */
@@ -78,8 +78,8 @@ class ModArchiveHelper
 
 
 			$lists[$i] = new stdClass;
 			$lists[$i] = new stdClass;
 
 
-			# $lists[$i]->link = JRoute::_('index.php?option=com_content_custom&view=archive&year=' . $createdYear . '&month=' . $createdMonth . $itemid);
 			$link = JRoute::_('index.php?option=com_content_custom&view=archive&year=' . $createdYear . '&month=' . $createdMonth . $itemid);
 			$link = JRoute::_('index.php?option=com_content_custom&view=archive&year=' . $createdYear . '&month=' . $createdMonth . $itemid);
+			// アーカイブコンポーネント以外でモジュールを表示した場合に以下の様にリンクを書き換える。
 			$link = str_replace("/component/content_custom/", "/information/info-archive.html", $link);
 			$link = str_replace("/component/content_custom/", "/information/info-archive.html", $link);
 
 
 			$lists[$i]->link = $link;
 			$lists[$i]->link = $link;
@@ -90,4 +90,4 @@ class ModArchiveHelper
 
 
 		return $lists;
 		return $lists;
 	}
 	}
-}
+}
\ No newline at end of file

@@ -16,4 +16,4 @@ $params->def('count', 10);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
 $list            = ModArchiveHelper::getList($params);
 $list            = ModArchiveHelper::getList($params);
 
 
-require JModuleHelper::getLayoutPath('mod_articles_archive_custom', $params->get('layout', 'default'));
\ No newline at end of file
+require JModuleHelper::getLayoutPath('mod_information_articles_archive_custom', $params->get('layout', 'default'));
\ No newline at end of file

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="module" version="3.1" client="site" method="upgrade">
 <extension type="module" version="3.1" client="site" method="upgrade">
-	<name>MOD_ARTICLES_ARCHIVE_CUSTOM</name>
+	<name>MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM</name>
 	<author>T.Tokudome</author>
 	<author>T.Tokudome</author>
 	<creationDate>June 2020</creationDate>
 	<creationDate>June 2020</creationDate>
 	<copyright></copyright>
 	<copyright></copyright>
@@ -8,17 +8,17 @@
 	<authorEmail>tokudome@lilli.co.jp</authorEmail>
 	<authorEmail>tokudome@lilli.co.jp</authorEmail>
 	<authorUrl></authorUrl>
 	<authorUrl></authorUrl>
 	<version>0.0.1</version>
 	<version>0.0.1</version>
-	<description>MOD_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION</description>
+	<description>MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_XML_DESCRIPTION</description>
 	<files>
 	<files>
-		<filename module="mod_articles_archive_custom">mod_articles_archive_custom.php</filename>
+		<filename module="mod_information_articles_archive_custom">mod_information_articles_archive_custom.php</filename>
 		<folder>tmpl</folder>
 		<folder>tmpl</folder>
 		<filename>helper.php</filename>
 		<filename>helper.php</filename>
 	</files>
 	</files>
 	<languages>
 	<languages>
-		<language tag="en-GB">en-GB.mod_articles_archive_custom.ini</language>
-		<language tag="en-GB">en-GB.mod_articles_archive_custom.sys.ini</language>
-		<language tag="ja-JP">ja-JP.mod_articles_archive_custom.ini</language>
-		<language tag="ja-JP">ja-JP.mod_articles_archive_custom.sys.ini</language>
+		<language tag="en-GB">en-GB.mod_information_articles_archive_custom.ini</language>
+		<language tag="en-GB">en-GB.mod_information_articles_archive_custom.sys.ini</language>
+		<language tag="ja-JP">ja-JP.mod_information_articles_archive_custom.ini</language>
+		<language tag="ja-JP">ja-JP.mod_information_articles_archive_custom.sys.ini</language>
 	</languages>
 	</languages>
 	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE" />
 	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE" />
 	<config>
 	<config>
@@ -27,8 +27,8 @@
 				<field
 				<field
 					name="count"
 					name="count"
 					type="number"
 					type="number"
-					label="MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL"
-					description="MOD_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC"
+					label="MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_LABEL"
+					description="MOD_INFORMATION_ARTICLES_ARCHIVE_CUSTOM_FIELD_COUNT_DESC"
 					default="120"
 					default="120"
 					filter="integer"
 					filter="integer"
 				/>
 				/>

 <?php
 <?php
 /**
 /**
  * @package     Joomla.Site
  * @package     Joomla.Site
- * @subpackage  mod_articles_archive
+ * @subpackage  mod_information_articles_archive_custom
  *
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @license     GNU General Public License version 2 or later; see LICENSE.txt