OSDN > Find Software > Internet > WWW/HTTP > Dynamic Content > Wiki > PukiWiki > SCM > git > pukiwiki > Commit

PukiWiki
Fork
pukiwiki_devel
pukiwiki_sandbox
pukiwiki

pukiwiki: Commit

BugTrack2/377 Add 'Template pages' label for template page list

--- a/en.lng.php

+++ b/en.lng.php

		@@ -1,8 +1,8 @@
1	1	<?php
2	2	// PukiWiki - Yet another WikiWikiWeb clone.
3		-// $Id: en.lng.php,v 1.16 2007/02/11 05:53:29 henoheno Exp $
4		-// Copyright (C)
5		-// 2002-2005 PukiWiki Developers Team
	3	+// en.lng.php
	4	+// Copyright
	5	+// 2002-2016 PukiWiki Development Team
6	6	// 2001-2002 Originally written by yu-ji
7	7	// License: GPL v2 or (at your option) any later version
8	8	//

		@@ -71,6 +71,7 @@ $_btn_template = 'Use page as template';
71	71	$_btn_load = 'Load';
72	72	$_btn_edit = 'Edit';
73	73	$_btn_delete = 'Delete';
	74	+$_label_template_pages = 'Template pages';
74	75
75	76	///////////////////////////////////////
76	77	// Authentication

--- a/ja.lng.php

+++ b/ja.lng.php

		@@ -1,8 +1,8 @@
1	1	<?php
2	2	// PukiWiki - Yet another WikiWikiWeb clone.
3		-// $Id: ja.lng.php,v 1.15 2007/02/11 05:53:29 henoheno Exp $
4		-// Copyright (C)
5		-// 2002-2005 PukiWiki Developers Team
	3	+// ja.lng.php
	4	+// Copyright
	5	+// 2002-2016 PukiWiki Development Team
6	6	// 2001-2002 Originally written by yu-ji
7	7	// License: GPL v2 or (at your option) any later version
8	8	//

		@@ -73,6 +73,7 @@ $_btn_template = '雛形とするページ';
73	73	$_btn_load = '読込';
74	74	$_btn_edit = '編集';
75	75	$_btn_delete = '削除';
	76	+$_label_template_pages = 'テンプレートページ';
76	77
77	78	///////////////////////////////////////
78	79	// Authentication

--- a/lib/html.php

+++ b/lib/html.php

		@@ -1,7 +1,7 @@
1	1	<?php
2	2	// PukiWiki - Yet another WikiWikiWeb clone.
3	3	// html.php
4		-// Copyright (C)
	4	+// Copyright
5	5	// 2002-2016 PukiWiki Development Team
6	6	// 2001-2002 Originally written by yu-ji
7	7	// License: GPL v2 or (at your option) any later version

		@@ -190,7 +190,7 @@ function edit_form($page, $postdata, $digest = FALSE, $b_template = TRUE)
190	190	global $_btn_preview, $_btn_repreview, $_btn_update, $_btn_cancel, $_msg_help;
191	191	global $whatsnew, $_btn_template, $_btn_load, $load_template_func;
192	192	global $notimeupdate;
193		- global $_title_list;
	193	+ global $_title_list, $_label_template_pages;
194	194
195	195	// Newly generate $digest or not
196	196	if ($digest === FALSE) $digest = md5(join('', get_source($page)));

		@@ -253,7 +253,7 @@ function edit_form($page, $postdata, $digest = FALSE, $b_template = TRUE)
253	253	$template = <<<EOD
254	254	<select name="template_page">
255	255	<option value="">-- $_btn_template --</option>
256		- <optgroup label="$_btn_template">
	256	+ <optgroup label="$_label_template_pages">
257	257	$s_tpages
258	258	</optgroup>
259	259	<optgroup label="$_title_list">