diff --git a/4dev/lang/admin/messages_en_utf8.po b/4dev/lang/admin/messages_en_utf8.po
index dbae943e..8f946d4d 100644
--- a/4dev/lang/admin/messages_en_utf8.po
+++ b/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"
diff --git a/4dev/lang/admin/messages_ja_utf8.po b/4dev/lang/admin/messages_ja_utf8.po
index 08b7000f..b5ef1dfc 100644
--- a/4dev/lang/admin/messages_ja_utf8.po
+++ b/4dev/lang/admin/messages_ja_utf8.po
@@ -75,3 +75,5 @@ msgstr "「スマーティー」これは正しいです"
msgid "Are we translated?"
msgstr "「クラス」これは翻訳です？"
+msgid "Original with string: %1"
+msgstr "%1と翻訳した"
diff --git a/www/admin/class_test.smarty.php b/www/admin/class_test.smarty.php
index 890295fc..2d87151e 100644
--- a/www/admin/class_test.smarty.php
+++ b/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
diff --git a/www/includes/lang/admin/en_utf8.mo b/www/includes/lang/admin/en_utf8.mo
index e4bc893d..6b528088 100644
Binary files a/www/includes/lang/admin/en_utf8.mo and b/www/includes/lang/admin/en_utf8.mo differ
diff --git a/www/includes/lang/admin/ja_utf8.mo b/www/includes/lang/admin/ja_utf8.mo
index a12a2bdf..39986a93 100644
Binary files a/www/includes/lang/admin/ja_utf8.mo and b/www/includes/lang/admin/ja_utf8.mo differ
diff --git a/www/includes/templates/admin/edit_body.tpl b/www/includes/templates/admin/edit_body.tpl
index c2d1074f..926d244d 100644
--- a/www/includes/templates/admin/edit_body.tpl
+++ b/www/includes/templates/admin/edit_body.tpl
@@ -33,26 +33,26 @@ function pop(theURL, winName, features) {
-
+
-
- |
-
+ |
diff --git a/www/includes/templates/admin/edit_new.tpl b/www/includes/templates/admin/edit_new.tpl
index e3d79ad9..bb678f8d 100644
--- a/www/includes/templates/admin/edit_new.tpl
+++ b/www/includes/templates/admin/edit_new.tpl
@@ -8,16 +8,16 @@
********************************************************************
*}
-