Smarty template updates for testing, edit templates updates, translation strings update

4dev/lang/admin/messages_en_utf8.po

@@ -33,3 +33,6 @@ msgstr "I should be translated: I WAS TRANSLATED"
 
 msgid "Are we translated?"
 msgstr "Are we translated? Yes, we are!"
+
+msgid "Original with string: %1"
+msgstr "Translated with: %1"

4dev/lang/admin/messages_ja_utf8.po

@@ -75,3 +75,5 @@ msgstr "「スマーティー」これは正しいです"
 msgid "Are we translated?"
 msgstr "「クラス」これは翻訳です？"
 
+msgid "Original with string: %1"
+msgstr "%1と翻訳した"

www/admin/class_test.smarty.php

@@ -65,16 +65,26 @@ if ($smarty->USE_PROTOTYPE) {
 	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js';
 }
 $smarty->PAGE_WIDTH = '100%';
-// require BASE.INCLUDES.'admin_set_paths.php';
 $smarty->setSmartyPaths();
 
 // smarty test
 $smarty->DATA['SMARTY_TEST'] = 'Test Data';
 $smarty->DATA['TRANSLATE_TEST'] = $l->__('Are we translated?');
 $smarty->DATA['TRANSLATE_TEST_SMARTY'] = $smarty->l10n->__('Are we translated?');
-
+$smarty->DATA['replace'] = 'Replaced';
+// variable variables
+$smarty->DATA['test'] = 'foo';
+$smarty->DATA['foo'] = 'bar';
+// loop
+$smarty->DATA['loop_start'] = 5;
 // drop down test with optgroups
-$options = [
+$smarty->DATA['drop_down_test'] = [
+	'foo' => 'Foo',
+	'bar' => 'Bar',
+	'foobar' => 'Foo Bar',
+];
+$smarty->DATA['drop_down_test_selected'] = 'bar';
+$smarty->DATA['drop_down_test_nested']  = [
 	'' => '選択してください',
 	'4/25(木)' => [
 		'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
@@ -89,11 +99,26 @@ $options = [
 		'4/27(土) 12:20-13:00' => '4/27(土) 12:20-13:00'
 	],
 ];
+$smarty->DATA['drop_down_test_nested_selected'] = '';
+$smarty->DATA['radio_test'] = [
+	'0' => 'On',
+	'1' => 'Off',
+	'-1' => 'Undefined'
+];
+$smarty->DATA['radio_test_selected'] = -1;
+$smarty->DATA['checkbox_test'] = [
+	'0' => 'On',
+	'1' => 'Off',
+	'-1' => 'Undefined'
+];
+$smarty->DATA['checkbox_test_pos'] = [
+	'0' => 'A',
+	'1' => 'B'
+];
+$smarty->DATA['checkbox_test_selected'] = ['1', '-1'];
+$smarty->DATA['checkbox_test_pos_selected'] = ['0', '-1'];
+
 
-$smarty->DATA['drop_down_test'] = $options;
-$smarty->DATA['drop_down_test_selected'] = '';
-$smarty->DATA['loop_start'] = 2;
-// require BASE.INCLUDES.'admin_smarty.php';
 $smarty->setSmartyVarsAdmin();
 
 // error message

www/includes/templates/admin/smarty_test.tpl

@@ -1,16 +1,27 @@
 <div>
-	{$SMARTY_TEST}
+	SMARTY_TEST: {$SMARTY_TEST}
-</div>
+</div>
-<div>
+<div {popup width="250" caption="Info" text="Text block<br>Control"} style="border: 1px solid black; margin: 5px 0 5px 0; padding: 5px;">
-	TRANSLATION CLASS (OUT): {$TRANSLATE_TEST}
+	POPUP HERE (hover mouse)
 </div>
 <div>
+	<b>Outside translation test</b><br>
+	TRANSLATION CLASS (OUT): {$TRANSLATE_TEST}<br>
 	TRANSLATION CLASS (SMARTY): {$TRANSLATE_TEST_SMARTY}
 </div>
 <div>
-	<select id="drop_down_test" name="drop_down_test">
+	<b>Translate Test with replace:</b><br>
-		{html_options options=$drop_down_test selected=$drop_down_test_selected}
+	ORIGINAL: Original with string: %1 ({$replace})<br>
-	</select>
+	TRANSLATED: {t 1=$replace}Original with string: %1{/t}<br>
+	TRANSLATED (escape): {t escape=on 1=$replace}Original with string: %1{/t}
+</div>
+<div>
+	<b>Variable variables:</b><br>
+	Test: {$test}<br>
+	Foo: {$foo}<br>
+	{assign var="bar" value="test"}
+	vFoo ($test = $foo = bar): {$test|getvar}<br>
+	vFoo ($bar = $test = foo): {$bar|getvar}
 </div>
 <div class="jq-container">
 	<div id="jq-test" class="jp-test">
@@ -23,11 +34,30 @@
 	</div>
 </div>
 <div class="loop-test">
-	<div>LOOP TEST</div>
+	<div><b>LOOP TEST</b></div>
 {section name=page_list start=1 loop=$loop_start+1}
 	<div>LOOP OUTPUT: {$smarty.section.page_list.index}</div>
 {/section}
 </div>
+<div>
+	<select id="drop_down_test" name="drop_down_test">
+		{html_options options=$drop_down_test selected=$drop_down_test_selected}
+	</select>
+</div>
+<div>
+	<select id="drop_down_test_nested" name="drop_down_test_nested">
+		{html_options options=$drop_down_test_nested selected=$drop_down_test_nested_selected}
+	</select>
+</div>
+<div>
+	{html_radios name="radio_test" options=$radio_test selected=$radio_test_selected}
+</div>
+<div>
+	{html_checkboxes name="checkbox_test" options=$checkbox_test selected=$checkbox_test_selected}
+</div>
+<div>
+	{html_checkboxes name="checkbox_test_pos" options=$checkbox_test selected=$checkbox_test_pos_selected pos=$checkbox_test_pos}
+</div>
 {* progresss indicator *}
 <div id="indicator"></div>
 {* the action confirm box *}

www/lib/CoreLibs/Template/SmartyExtend.php

@@ -198,20 +198,21 @@ class SmartyExtend extends SmartyBC
 	{
 		// just emergency fallback for language
 		// set encoding
-		if (isset($_SESSION['DEFAULT_CHARSET'])) {
+		if (!empty($_SESSION['DEFAULT_CHARSET'])) {
 			$this->encoding = $_SESSION['DEFAULT_CHARSET'];
 		} else {
 			$this->encoding = DEFAULT_ENCODING;
 		}
 		// gobal override
-		if (isset($GLOBALS['OVERRIDE_LANG'])) {
+		if (!empty($GLOBALS['OVERRIDE_LANG'])) {
 			$this->lang = $GLOBALS['OVERRIDE_LANG'];
-		} elseif (isset($_SESSION['DEFAULT_LANG'])) {
+		} elseif (!empty($_SESSION['DEFAULT_LANG'])) {
 			// session (login)
 			$this->lang = $_SESSION['DEFAULT_LANG'];
 		} else {
 			// mostly default SITE LANG or DEFAULT LANG
-			$this->lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
+			$this->lang = defined('SITE_LANG') && !empty('SITE_LANG') ?
+				SITE_LANG : DEFAULT_LANG;
 		}
 		// create the char lang encoding
 		$this->lang_short = substr($this->lang, 0, 2);

www/lib/CoreLibs/Template/SmartyExtend4.php

@@ -195,20 +195,21 @@ class SmartyExtend4 extends Smarty
 	{
 		// just emergency fallback for language
 		// set encoding
-		if (isset($_SESSION['DEFAULT_CHARSET'])) {
+		if (!empty($_SESSION['DEFAULT_CHARSET'])) {
 			$this->encoding = $_SESSION['DEFAULT_CHARSET'];
 		} else {
 			$this->encoding = DEFAULT_ENCODING;
 		}
 		// gobal override
-		if (isset($GLOBALS['OVERRIDE_LANG'])) {
+		if (!empty($GLOBALS['OVERRIDE_LANG'])) {
 			$this->lang = $GLOBALS['OVERRIDE_LANG'];
-		} elseif (isset($_SESSION['DEFAULT_LANG'])) {
+		} elseif (!empty($_SESSION['DEFAULT_LANG'])) {
 			// session (login)
 			$this->lang = $_SESSION['DEFAULT_LANG'];
 		} else {
 			// mostly default SITE LANG or DEFAULT LANG
-			$this->lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
+			$this->lang = defined('SITE_LANG') && !empty('SITE_LANG') ?
+				SITE_LANG : DEFAULT_LANG;
 		}
 		// create the char lang encoding
 		$this->lang_short = substr($this->lang, 0, 2);