Submit/Cancelの多言語化

diff --git a/app/config/core.php.bk b/app/config/core.php.bk
new file mode 100644 (file)
index 0000000..f08421c
--- /dev/null
+++ b/app/config/core.php.bk
@@ -0,0 +1,232 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * This is core configuration file.
+ *
+ * Use it to configure core behavior of Cake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 0.2.9
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+/**
+ * CakePHP Debug Level:
+ *
+ * Production Mode:
+ *     0: No error messages, errors, or warnings shown. Flash messages redirect.
+ *
+ * Development Mode:
+ *     1: Errors and warnings shown, model caches refreshed, flash messages halted.
+ *     2: As in 1, but also with full debug messages and SQL output.
+ *     3: As in 2, but also with full controller dump.
+ *
+ * In production mode, flash messages redirect after a time interval.
+ * In development mode, you need to click the flash message to continue.
+ */
+       Configure::write('debug', 2);
+/**
+ * Application wide charset encoding
+ */
+       Configure::write('App.encoding', 'UTF-8');
+/**
+ * To configure CakePHP *not* to use mod_rewrite and to
+ * use CakePHP pretty URLs, remove these .htaccess
+ * files:
+ *
+ * /.htaccess
+ * /app/.htaccess
+ * /app/webroot/.htaccess
+ *
+ * And uncomment the App.baseUrl below:
+ */
+       //Configure::write('App.baseUrl', env('SCRIPT_NAME'));
+/**
+ * Uncomment the define below to use CakePHP admin routes.
+ *
+ * The value of the define determines the name of the route
+ * and its associated controller actions:
+ *
+ * 'admin'             -> admin_index() and /admin/controller/index
+ * 'superuser' -> superuser_index() and /superuser/controller/index
+ */
+       Configure::write('Routing.admin', 'admin');
+
+/**
+ * Turn off all caching application-wide.
+ *
+ */
+       //Configure::write('Cache.disable', true);
+/**
+ * Enable cache checking.
+ *
+ * If set to true, for view caching you must still use the controller
+ * var $cacheAction inside your controllers to define caching settings.
+ * You can either set it controller-wide by setting var $cacheAction = true,
+ * or in each action using $this->cacheAction = true.
+ *
+ */
+       Configure::write('Cache.check', true);
+/**
+ * Defines the default error type when using the log() function. Used for
+ * differentiating error logging and debugging. Currently PHP supports LOG_DEBUG.
+ */
+       define('LOG_ERROR', 2);
+/**
+ * The preferred session handling method. Valid values:
+ *
+ * 'php'                       Uses settings defined in your php.ini.
+ * 'cake'              Saves session files in CakePHP's /tmp directory.
+ * 'database'  Uses CakePHP's database sessions.
+ *
+ * To define a custom session handler, save it at /app/config/<name>.php.
+ * Set the value of 'Session.save' to <name> to utilize it in CakePHP.
+ *
+ * To use database sessions, execute the SQL file found at /app/config/sql/sessions.sql.
+ *
+ */
+       Configure::write('Session.save', 'database');
+/**
+ * The name of the table used to store CakePHP database sessions.
+ *
+ * 'Session.save' must be set to 'database' in order to utilize this constant.
+ *
+ * The table name set here should *not* include any table prefix defined elsewhere.
+ */
+       Configure::write('Session.table', 'cake_sessions');
+/**
+ * The DATABASE_CONFIG::$var to use for database session handling.
+ *
+ * 'Session.save' must be set to 'database' in order to utilize this constant.
+ */
+       Configure::write('Session.database', 'default');
+/**
+ * The name of CakePHP's session cookie.
+ */
+       Configure::write('Session.cookie', 'CAKEPHP');
+/**
+ * Session time out time (in seconds).
+ * Actual value depends on 'Security.level' setting.
+ */
+       Configure::write('Session.timeout', '432'); // 60 * 60 * 12 / 100
+/**
+ * If set to false, sessions are not automatically started.
+ */
+       Configure::write('Session.start', true);
+/**
+ * When set to false, HTTP_USER_AGENT will not be checked
+ * in the session
+ */
+       Configure::write('Session.checkAgent', true);
+/**
+ * The level of CakePHP security. The session timeout time defined
+ * in 'Session.timeout' is multiplied according to the settings here.
+ * Valid values:
+ *
+ * 'high'      Session timeout in 'Session.timeout' x 10
+ * 'medium'    Session timeout in 'Session.timeout' x 100
+ * 'low'               Session timeout in 'Session.timeout' x 300
+ *
+ * CakePHP session IDs are also regenerated between requests if
+ * 'Security.level' is set to 'high'.
+ */
+       Configure::write('Security.level', 'medium');
+/**
+ * A random string used in security hashing methods.
+ */
+       Configure::write('Security.salt', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mitest');
+/**
+ * Compress CSS output by removing comments, whitespace, repeating tags, etc.
+ * This requires a/var/cache directory to be writable by the web server for caching.
+ * and /vendors/csspp/csspp.php
+ *
+ * To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use HtmlHelper::css().
+ */
+       //Configure::write('Asset.filter.css', 'css.php');
+/**
+ * Plug in your own custom JavaScript compressor by dropping a script in your webroot to handle the
+ * output, and setting the config below to the name of the script.
+ *
+ * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JavaScriptHelper::link().
+ */
+       //Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php');
+/**
+ * The classname and database used in CakePHP's
+ * access control lists.
+ */
+       //Configure::write('Acl.classname', 'DbAcl');
+       //Configure::write('Acl.database', 'default');
+/**
+ * If you are on PHP 5.3 uncomment this line and correct your server timezone
+ * to fix the date & time related errors.
+ */
+       //date_default_timezone_set('UTC');
+/**
+ *
+ * Cache Engine Configuration
+ * Default settings provided below
+ *
+ * File storage engine.
+ *
+ *      Cache::config('default', array(
+ *             'engine' => 'File', //[required]
+ *             'duration'=> 3600, //[optional]
+ *             'probability'=> 100, //[optional]
+ *             'path' => CACHE, //[optional] use system tmp directory - remember to use absolute path
+ *             'prefix' => 'cake_', //[optional]  prefix every cache file with this string
+ *             'lock' => false, //[optional]  use file locking
+ *             'serialize' => true, [optional]
+ *     ));
+ *
+ *
+ * APC (http://pecl.php.net/package/APC)
+ *
+ *      Cache::config('default', array(
+ *             'engine' => 'Apc', //[required]
+ *             'duration'=> 3600, //[optional]
+ *             'probability'=> 100, //[optional]
+ *             'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
+ *     ));
+ *
+ * Xcache (http://xcache.lighttpd.net/)
+ *
+ *      Cache::config('default', array(
+ *             'engine' => 'Xcache', //[required]
+ *             'duration'=> 3600, //[optional]
+ *             'probability'=> 100, //[optional]
+ *             'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
+ *             'user' => 'user', //user from xcache.admin.user settings
+ *      'password' => 'password', //plaintext password (xcache.admin.pass)
+ *     ));
+ *
+ *
+ * Memcache (http://www.danga.com/memcached/)
+ *
+ *      Cache::config('default', array(
+ *             'engine' => 'Memcache', //[required]
+ *             'duration'=> 3600, //[optional]
+ *             'probability'=> 100, //[optional]
+ *             'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
+ *             'servers' => array(
+ *                     '127.0.0.1:11211' // localhost, default port 11211
+ *             ), //[optional]
+ *             'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
+ *     ));
+ *
+ */
+       Cache::config('default', array('engine' => 'File'));
+?>

diff --git a/app/controllers/character_pictures_controller.php b/app/controllers/character_pictures_controller.php
index 8e21983..3a30abc 100644 (file)
--- a/app/controllers/character_pictures_controller.php
+++ b/app/controllers/character_pictures_controller.php
@@ -358,6 +358,7 @@ class CharacterPicturesController extends AppController {
                        $isOwner = false;
                }
                $this->set('isAdmin', $isAdmin);
+               $this->set('isOwner', $isOwner);
 
                $this->pageTitle .= " - ". sprintf(__("%s's Picture", true), $character_picture['Character']['name']);
                if (isset($character_picture['Attachment'][0]['alternative']) &&!empty($character_picture['Attachment'][0]['alternative'])) {

diff --git a/app/locale/jpn/LC_MESSAGES/default.po b/app/locale/jpn/LC_MESSAGES/default.po
index 61825b2..0a98363 100644 (file)
--- a/app/locale/jpn/LC_MESSAGES/default.po
+++ b/app/locale/jpn/LC_MESSAGES/default.po
@@ -14,6 +14,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: /
+msgid "Submit"
+msgstr "送信"
+
+#: /
+msgid "Cancel"
+msgstr "キャンセル"
+
 #: /error.php:8
 msgid "PC View"
 msgstr ""

diff --git a/app/views/character_pictures/add.ctp b/app/views/character_pictures/add.ctp
index 3a85b30..ae35ff3 100644 (file)
--- a/app/views/character_pictures/add.ctp
+++ b/app/views/character_pictures/add.ctp
@@ -26,7 +26,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -36,7 +36,7 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/character_pictures/admin_delete.ctp b/app/views/character_pictures/admin_delete.ctp
index ebcb922..6a6e1d5 100644 (file)
--- a/app/views/character_pictures/admin_delete.ctp
+++ b/app/views/character_pictures/admin_delete.ctp
@@ -46,7 +46,7 @@
                )
        );
        echo $token->create();
-       echo $form->end('Submit');
+       echo $form->end(array('label' => __('Submit', true)));
 ?>
 </div>
 
@@ -59,7 +59,7 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/character_pictures/delete.ctp b/app/views/character_pictures/delete.ctp
index ebcb922..6a6e1d5 100644 (file)
--- a/app/views/character_pictures/delete.ctp
+++ b/app/views/character_pictures/delete.ctp
@@ -46,7 +46,7 @@
                )
        );
        echo $token->create();
-       echo $form->end('Submit');
+       echo $form->end(array('label' => __('Submit', true)));
 ?>
 </div>
 
@@ -59,7 +59,7 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/character_pictures/edit.ctp b/app/views/character_pictures/edit.ctp
index e5ca6ec..822d58a 100644 (file)
--- a/app/views/character_pictures/edit.ctp
+++ b/app/views/character_pictures/edit.ctp
@@ -27,16 +27,16 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
 <?php
-       echo $form->create('CharacterPicture', array('url' => array(
-               'controller' => 'character_pictures', 'action' => 'view'),
+       echo $form->create('', array('url' => array(
+               'controller' => 'character_pictures', 'action' => 'listview', 'id' => $this->data['CharacterPicture']['character_id']),
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/character_profile_archives/edit.ctp b/app/views/character_profile_archives/edit.ctp
index ddbd994..628efe6 100644 (file)
--- a/app/views/character_profile_archives/edit.ctp
+++ b/app/views/character_profile_archives/edit.ctp
@@ -34,7 +34,7 @@
        echo $token->create();
        ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -45,6 +45,6 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/character_sheets/admin_add.ctp b/app/views/character_sheets/admin_add.ctp
index 970f1db..f6dd6d2 100644 (file)
--- a/app/views/character_sheets/admin_add.ctp
+++ b/app/views/character_sheets/admin_add.ctp
@@ -83,7 +83,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -92,7 +92,7 @@ echo $form->create('', array('url' => array(
        'action' => 'index', $this_system['System']['id']),
        'type' => 'GET',
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/character_sheets/admin_view.ctp b/app/views/character_sheets/admin_view.ctp
index 6907317..5ec6206 100644 (file)
--- a/app/views/character_sheets/admin_view.ctp
+++ b/app/views/character_sheets/admin_view.ctp
@@ -57,7 +57,7 @@
                )))
        ).
        $token->create().
-       $form->end('Submit');
+       $form->end(array('label' => __('Submit', true)));
 
        $body .= "</fieldset>\n";
 
@@ -124,7 +124,7 @@
                        'default' => $characterSheets['CharacterSheet']['sort_order'],
                )).
                $token->create().
-               $form->end('Submit');
+               $form->end(array('label' => __('Submit', true)));
 
        $body .= "</fieldset>\n";
 

diff --git a/app/views/characters/add.ctp b/app/views/characters/add.ctp
index 3b7bc40..f4a4886 100644 (file)
--- a/app/views/characters/add.ctp
+++ b/app/views/characters/add.ctp
@@ -53,7 +53,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -63,7 +63,7 @@
                'type' => 'GET', 
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/characters/add_milti_profiles.ctp b/app/views/characters/add_milti_profiles.ctp
index be57f88..131cd90 100644 (file)
--- a/app/views/characters/add_milti_profiles.ctp
+++ b/app/views/characters/add_milti_profiles.ctp
@@ -91,7 +91,7 @@ $profiledisp->disp_forms4profile_type($profile, $count, 0, false, null, true, ar
 <?php
        echo $token->create();
        ?>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </p>
 </div>
 
@@ -102,7 +102,7 @@ echo $form->create('Character', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/characters/admin_delete.ctp b/app/views/characters/admin_delete.ctp
index 1c1d8fd..b9e1f73 100644 (file)
--- a/app/views/characters/admin_delete.ctp
+++ b/app/views/characters/admin_delete.ctp
@@ -40,7 +40,7 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/characters/admin_edit.ctp b/app/views/characters/admin_edit.ctp
index 0dccb51..e1222fc 100644 (file)
--- a/app/views/characters/admin_edit.ctp
+++ b/app/views/characters/admin_edit.ctp
@@ -24,7 +24,7 @@
        ));
 
        echo $token->create();
-       echo $form->end('Submit');
+       echo $form->end(array('label' => __('Submit', true)));
 ?>
 </div>
 
@@ -35,7 +35,7 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/characters/change_system.ctp b/app/views/characters/change_system.ctp
index 3b624e6..80b5640 100644 (file)
--- a/app/views/characters/change_system.ctp
+++ b/app/views/characters/change_system.ctp
@@ -43,7 +43,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -55,7 +55,7 @@
                'type' => 'GET', 
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/characters/delete.ctp b/app/views/characters/delete.ctp
index 1c1d8fd..b9e1f73 100644 (file)
--- a/app/views/characters/delete.ctp
+++ b/app/views/characters/delete.ctp
@@ -40,7 +40,7 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/characters/edit.ctp b/app/views/characters/edit.ctp
index f9d5255..d9771d8 100644 (file)
--- a/app/views/characters/edit.ctp
+++ b/app/views/characters/edit.ctp
@@ -184,7 +184,8 @@
 
 <?php
        echo $token->create();
-       echo $form->end('Submit');?>
+       echo $form->end(array('label' => __('Submit', true)));
+?>
 </p>
 </div>
 
@@ -195,7 +196,7 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/elements/character_profile_archive_confirm.ctp b/app/views/elements/character_profile_archive_confirm.ctp
index b894108..bc3dd7b 100644 (file)
--- a/app/views/elements/character_profile_archive_confirm.ctp
+++ b/app/views/elements/character_profile_archive_confirm.ctp
@@ -87,7 +87,7 @@ echo preg_replace('/[\\\n]/', ' ', $characterProfileArchive['CharacterProfileArc
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 
@@ -99,7 +99,7 @@ $url2 = Router::url(array(
        $character['Character']['id']), true);
 
        echo $form->create('', array('url' => $url2));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/elements/character_profile_archive_index.ctp b/app/views/elements/character_profile_archive_index.ctp
index c4d3bd9..25ba24c 100644 (file)
--- a/app/views/elements/character_profile_archive_index.ctp
+++ b/app/views/elements/character_profile_archive_index.ctp
@@ -102,5 +102,5 @@ echo $paginator->sort(__('Title', true),'title');
 
        echo $token->create();
 ?>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>

diff --git a/app/views/groups/admin_add.ctp b/app/views/groups/admin_add.ctp
index 371622b..fd3003a 100644 (file)
--- a/app/views/groups/admin_add.ctp
+++ b/app/views/groups/admin_add.ctp
@@ -7,7 +7,7 @@
                echo $form->input('parent_id');
        ?>
        </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 <div class="actions">
        <ul>

diff --git a/app/views/groups/admin_edit.ctp b/app/views/groups/admin_edit.ctp
index 2d8043b..7255e94 100644 (file)
--- a/app/views/groups/admin_edit.ctp
+++ b/app/views/groups/admin_edit.ctp
@@ -8,7 +8,7 @@
                echo $form->input('parent_id');
        ?>
        </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 <div class="actions">
        <ul>

diff --git a/app/views/profile_selects/admin_add.ctp b/app/views/profile_selects/admin_add.ctp
index 5a467c0..8317c97 100644 (file)
--- a/app/views/profile_selects/admin_add.ctp
+++ b/app/views/profile_selects/admin_add.ctp
@@ -23,7 +23,7 @@
 echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -33,6 +33,6 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/profile_selects/admin_edit.ctp b/app/views/profile_selects/admin_edit.ctp
index 2920f83..85bdfd2 100644 (file)
--- a/app/views/profile_selects/admin_edit.ctp
+++ b/app/views/profile_selects/admin_edit.ctp
@@ -19,7 +19,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -29,6 +29,6 @@ echo $form->create('', array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/profile_selects/admin_listview.ctp b/app/views/profile_selects/admin_listview.ctp
index 4ac811f..3b7ef54 100644 (file)
--- a/app/views/profile_selects/admin_listview.ctp
+++ b/app/views/profile_selects/admin_listview.ctp
@@ -113,7 +113,7 @@ echo $form->create(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Back');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/profile_table_statics/admin_edit.ctp b/app/views/profile_table_statics/admin_edit.ctp
index 18eeb7f..98c9e30 100644 (file)
--- a/app/views/profile_table_statics/admin_edit.ctp
+++ b/app/views/profile_table_statics/admin_edit.ctp
@@ -60,7 +60,7 @@ if (isset($this->data['ProfileTableStatic'][$i]['id'])) {
 <?php
        echo $token->create();
        ?>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </p>
 </div>
 
@@ -71,7 +71,7 @@ echo $form->create('ProfileTableStatic', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/profile_tables/admin_add.ctp b/app/views/profile_tables/admin_add.ctp
index 5c63be8..b7a6e9f 100644 (file)
--- a/app/views/profile_tables/admin_add.ctp
+++ b/app/views/profile_tables/admin_add.ctp
@@ -59,7 +59,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 
@@ -70,6 +70,6 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/profile_tables/admin_edit.ctp b/app/views/profile_tables/admin_edit.ctp
index 6a18f4c..cce5fa5 100644 (file)
--- a/app/views/profile_tables/admin_edit.ctp
+++ b/app/views/profile_tables/admin_edit.ctp
@@ -58,7 +58,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -68,6 +68,6 @@ echo $form->create('', array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/profile_tables/admin_listview.ctp b/app/views/profile_tables/admin_listview.ctp
index 7171d09..bbafaa2 100644 (file)
--- a/app/views/profile_tables/admin_listview.ctp
+++ b/app/views/profile_tables/admin_listview.ctp
@@ -138,7 +138,7 @@ echo $form->create(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Back');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/profiles/admin_add.ctp b/app/views/profiles/admin_add.ctp
index a6827e2..20e5a1e 100644 (file)
--- a/app/views/profiles/admin_add.ctp
+++ b/app/views/profiles/admin_add.ctp
@@ -71,7 +71,7 @@
        echo $token->create();
        ?>
        </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -83,6 +83,6 @@ echo $form->create(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/profiles/admin_edit.ctp b/app/views/profiles/admin_edit.ctp
index f338792..ba7f3d8 100644 (file)
--- a/app/views/profiles/admin_edit.ctp
+++ b/app/views/profiles/admin_edit.ctp
@@ -76,7 +76,7 @@
        echo $token->create();
        ?>
        </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -88,7 +88,7 @@ echo $form->create(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/profiles/admin_export_profiles.ctp b/app/views/profiles/admin_export_profiles.ctp
index 2176726..f936421 100644 (file)
--- a/app/views/profiles/admin_export_profiles.ctp
+++ b/app/views/profiles/admin_export_profiles.ctp
@@ -30,7 +30,7 @@
        echo $token->create();
 ?>
 </fieldset>
-       <?php echo $form->end('Submit');?>
+       <?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -40,6 +40,6 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/profiles/admin_import_profiles.ctp b/app/views/profiles/admin_import_profiles.ctp
index 670c096..05f23b3 100644 (file)
--- a/app/views/profiles/admin_import_profiles.ctp
+++ b/app/views/profiles/admin_import_profiles.ctp
@@ -21,7 +21,7 @@
        echo $token->create();
 ?>
 </fieldset>
-       <?php echo $form->end('Submit');?>
+       <?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -31,6 +31,6 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/regist_mails/add.ctp b/app/views/regist_mails/add.ctp
index 5581d5a..c9134ac 100644 (file)
--- a/app/views/regist_mails/add.ctp
+++ b/app/views/regist_mails/add.ctp
@@ -11,7 +11,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 
@@ -22,7 +22,7 @@
                'action' => 'login'), 
                'type' => 'GET',
                'id' => 'CancelButton'));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/site_configs/admin_delete_allcache.ctp b/app/views/site_configs/admin_delete_allcache.ctp
index 16629a5..f827a81 100644 (file)
--- a/app/views/site_configs/admin_delete_allcache.ctp
+++ b/app/views/site_configs/admin_delete_allcache.ctp
@@ -24,7 +24,7 @@ echo $token->create();
 ?>
 
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -34,7 +34,7 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/systems/admin_add.ctp b/app/views/systems/admin_add.ctp
index 95f482f..69d7357 100644 (file)
--- a/app/views/systems/admin_add.ctp
+++ b/app/views/systems/admin_add.ctp
@@ -57,7 +57,7 @@
        echo $token->create();
 ?>
 </fieldset>
-       <?php echo $form->end('Submit');?>
+       <?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -67,7 +67,7 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/systems/admin_delete.ctp b/app/views/systems/admin_delete.ctp
index 3d3aacb..47d70b4 100644 (file)
--- a/app/views/systems/admin_delete.ctp
+++ b/app/views/systems/admin_delete.ctp
@@ -100,7 +100,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -110,7 +110,7 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/systems/admin_edit.ctp b/app/views/systems/admin_edit.ctp
index 11f894f..bad9d96 100644 (file)
--- a/app/views/systems/admin_edit.ctp
+++ b/app/views/systems/admin_edit.ctp
@@ -64,7 +64,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -74,7 +74,7 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/users/add.ctp b/app/views/users/add.ctp
index 450f746..5659ef3 100644 (file)
--- a/app/views/users/add.ctp
+++ b/app/views/users/add.ctp
@@ -40,7 +40,7 @@ echo $form->create('User', array('url' => array(
        );
        ?>
        </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -49,7 +49,7 @@ echo $form->create('User', array('url' => array(
                'action' => 'login'), 
                'type' => 'GET',
                'id' => 'CancelButton'));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/users/admin_add.ctp b/app/views/users/admin_add.ctp
index 41f89e7..b461d7c 100644 (file)
--- a/app/views/users/admin_add.ctp
+++ b/app/views/users/admin_add.ctp
@@ -41,7 +41,7 @@ if ($site_configs['Site.registMail']['value']) {
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -51,6 +51,6 @@ if ($site_configs['Site.registMail']['value']) {
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/users/admin_change_password.ctp b/app/views/users/admin_change_password.ctp
index 7c327b6..9425261 100644 (file)
--- a/app/views/users/admin_change_password.ctp
+++ b/app/views/users/admin_change_password.ctp
@@ -21,7 +21,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -31,6 +31,6 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/users/admin_delete.ctp b/app/views/users/admin_delete.ctp
index 7a74881..fdd2eaf 100644 (file)
--- a/app/views/users/admin_delete.ctp
+++ b/app/views/users/admin_delete.ctp
@@ -123,7 +123,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -133,6 +133,6 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/users/admin_edit.ctp b/app/views/users/admin_edit.ctp
index 3a2369b..2260b64 100644 (file)
--- a/app/views/users/admin_edit.ctp
+++ b/app/views/users/admin_edit.ctp
@@ -24,7 +24,7 @@
        );
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -34,7 +34,7 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/users/admin_listview.ctp b/app/views/users/admin_listview.ctp
index 90d9aa2..f757c14 100644 (file)
--- a/app/views/users/admin_listview.ctp
+++ b/app/views/users/admin_listview.ctp
@@ -4,7 +4,7 @@
 <div class="search form">
 <?php echo $form->create('User', array('action' => 'listview', 'type' => 'post')); ?>
 <?php echo $form->input('name'); ?>
-<?php echo $form->end('Search'); ?>
+<?php echo $form->end(array('label' => __('Submit', true))); ?>
 </div>
 </fieldset>
 

diff --git a/app/views/users/change_password.ctp b/app/views/users/change_password.ctp
index 618fdbd..2ec20a1 100644 (file)
--- a/app/views/users/change_password.ctp
+++ b/app/views/users/change_password.ctp
@@ -28,7 +28,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -38,6 +38,6 @@
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
-       echo $form->end('Cancel');
+       echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/users/delete.ctp b/app/views/users/delete.ctp
index e58fb9d..866ce8c 100644 (file)
--- a/app/views/users/delete.ctp
+++ b/app/views/users/delete.ctp
@@ -17,7 +17,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -27,6 +27,6 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>

diff --git a/app/views/users/edit.ctp b/app/views/users/edit.ctp
index 4fd23bf..04d05ef 100644 (file)
--- a/app/views/users/edit.ctp
+++ b/app/views/users/edit.ctp
@@ -10,7 +10,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -20,7 +20,7 @@ echo $form->create('', array('url' => array(
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/users/edit_image.ctp b/app/views/users/edit_image.ctp
index a861f02..e9bdbbf 100644 (file)
--- a/app/views/users/edit_image.ctp
+++ b/app/views/users/edit_image.ctp
@@ -17,7 +17,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="backButton">
@@ -26,7 +26,7 @@ echo $form->create('', array('url' => array(
        'action' => 'view', $this->data['User']['id']),
        'type' => 'GET',
 ));
-echo $form->end('Cancel');
+echo $form->end(array('label' => __('Cancel', true)));
 ?>
 </div>
 

diff --git a/app/views/users/mobile_add.ctp b/app/views/users/mobile_add.ctp
index 55eb50b..3c5682e 100644 (file)
--- a/app/views/users/mobile_add.ctp
+++ b/app/views/users/mobile_add.ctp
@@ -24,7 +24,7 @@
        ));
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="actions">

diff --git a/app/views/users/mobile_change_password.ctp b/app/views/users/mobile_change_password.ctp
index e0bdc04..f79c97b 100644 (file)
--- a/app/views/users/mobile_change_password.ctp
+++ b/app/views/users/mobile_change_password.ctp
@@ -24,7 +24,7 @@
 );
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="actions">

diff --git a/app/views/users/mobile_delete.ctp b/app/views/users/mobile_delete.ctp
index 4f98858..eb8fe3b 100644 (file)
--- a/app/views/users/mobile_delete.ctp
+++ b/app/views/users/mobile_delete.ctp
@@ -13,5 +13,5 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>

diff --git a/app/views/users/mobile_edit.ctp b/app/views/users/mobile_edit.ctp
index 5a5efd5..9b9879c 100644 (file)
--- a/app/views/users/mobile_edit.ctp
+++ b/app/views/users/mobile_edit.ctp
@@ -10,7 +10,7 @@
        echo $token->create();
 ?>
 </fieldset>
-<?php echo $form->end('Submit');?>
+<?php echo $form->end(array('label' => __('Submit', true)));?>
 </div>
 
 <div class="actions">

diff --git a/app/views/users/mobile_login.ctp b/app/views/users/mobile_login.ctp
index 17b3fb0..18ddf42 100644 (file)
--- a/app/views/users/mobile_login.ctp
+++ b/app/views/users/mobile_login.ctp
@@ -2,5 +2,5 @@
        echo $form->create('User', array('action' => 'mobile_login'));
        echo $form->input('username');
        echo $form->input('password');
-       echo $form->end('Login');
+       echo $form->end(array('label' => __('Submit', true)));