diff --git a/Controller/AccountsController.php b/Controller/AccountsController.php index 1602148..1f2d193 100644 --- a/Controller/AccountsController.php +++ b/Controller/AccountsController.php @@ -57,8 +57,8 @@ public function show() { $this->set('title_for_layout', __d('webzash', 'Chart Of Accounts')); $this->set('actionlinks', array( - array('controller' => 'groups', 'action' => 'add', 'title' => 'Add Group'), - array('controller' => 'ledgers', 'action' => 'add', 'title' => 'Add Ledger') + array('controller' => 'groups', 'action' => 'add', 'title' => __d('webzash', 'Add Group')), + array('controller' => 'ledgers', 'action' => 'add', 'title' => __d('webzash', 'Add Ledger')) )); $accountlist = new AccountList(); $accountlist->Group = &$this->Group; diff --git a/Controller/ReportsController.php b/Controller/ReportsController.php index b0fc04c..48ad57f 100644 --- a/Controller/ReportsController.php +++ b/Controller/ReportsController.php @@ -131,12 +131,12 @@ public function balancesheet() { if (!empty($this->passedArgs['startdate']) && !empty($this->passedArgs['enddate'])) { $this->set('subtitle', __d('webzash', 'Balance Sheet from ' . - dateFromSql(dateToSQL($this->passedArgs['startdate'])) . ' to ' . + dateFromSql(dateToSQL($this->passedArgs['startdate'])) . __d('webzash', ' to ') . dateFromSql(dateToSQL($this->passedArgs['enddate'])) )); } else if (!empty($this->passedArgs['startdate'])) { $this->set('subtitle', __d('webzash', 'Balance Sheet from ' . - dateFromSql(dateToSQL($this->passedArgs['startdate'])) . ' to ' . + dateFromSql(dateToSQL($this->passedArgs['startdate'])) . __d('webzash', ' to ') . dateFromSql(Configure::read('Account.enddate')) )); } else if (!empty($this->passedArgs['enddate'])) { @@ -349,7 +349,7 @@ public function profitloss() { /* Sub-title*/ $this->set('subtitle', __d('webzash', 'Trading and Profit & Loss Statement from ') . - dateFromSql(Configure::read('Account.startdate')) . ' to ' . + dateFromSql(Configure::read('Account.startdate')) . __d('webzash', ' to ') . dateFromSql(Configure::read('Account.enddate'))); } else { $this->set('options', true); @@ -374,17 +374,17 @@ public function profitloss() { if (!empty($this->passedArgs['startdate']) && !empty($this->passedArgs['enddate'])) { $this->set('subtitle', __d('webzash', 'Trading and Profit & Loss Statement from ' . - dateFromSql(dateToSQL($this->passedArgs['startdate'])) . ' to ' . + dateFromSql(dateToSQL($this->passedArgs['startdate'])) . __d('webzash', ' to ') . dateFromSql(dateToSQL($this->passedArgs['enddate'])) )); } else if (!empty($this->passedArgs['startdate'])) { $this->set('subtitle', __d('webzash', 'Trading and Profit & Loss Statement from ' . - dateFromSql(dateToSQL($this->passedArgs['startdate'])) . ' to ' . + dateFromSql(dateToSQL($this->passedArgs['startdate'])) . __d('webzash', ' to ') . dateFromSql(Configure::read('Account.enddate')) )); } else if (!empty($this->passedArgs['enddate'])) { $this->set('subtitle', __d('webzash', 'Trading and Profit & Loss Statement from ' . - dateFromSql(Configure::read('Account.startdate')) . ' to ' . + dateFromSql(Configure::read('Account.startdate')) . __d('webzash', ' to ') . dateFromSql(dateToSQL($this->passedArgs['enddate'])) )); } diff --git a/View/Dashboard/index.ctp b/View/Dashboard/index.ctp index 3571422..eb700a6 100644 --- a/View/Dashboard/index.ctp +++ b/View/Dashboard/index.ctp @@ -62,7 +62,7 @@ if (!extension_loaded('bcmath')) { - + diff --git a/View/Elements/accountinfo.ctp b/View/Elements/accountinfo.ctp index 8a54d71..4b5c4d3 100644 --- a/View/Elements/accountinfo.ctp +++ b/View/Elements/accountinfo.ctp @@ -31,6 +31,6 @@ if ($this->Session->read('ActiveAccount.id')) { echo ' '; echo $this->Html->link(__d('webzash', '(change)'), array('plugin' => 'webzash', 'controller' => 'wzusers', 'action' => 'account')); echo '
'; - echo dateFromSql(Configure::read('Account.startdate')) . ' to ' . dateFromSql(Configure::read('Account.enddate')); + echo dateFromSql(Configure::read('Account.startdate')) . __d('webzash', ' to ') . dateFromSql(Configure::read('Account.enddate')); } } diff --git a/View/Elements/defaultnavbar.ctp b/View/Elements/defaultnavbar.ctp index 73733db..e3a37f6 100644 --- a/View/Elements/defaultnavbar.ctp +++ b/View/Elements/defaultnavbar.ctp @@ -49,7 +49,7 @@
  • Html->link(__d('webzash', 'Accounts'), array('plugin' => 'webzash', 'controller' => 'accounts', 'action' => 'show')); ?>
  • ' . $this->Html->link(__d('webzash', 'Entries'), array('plugin' => 'webzash', 'controller' => 'entries', 'action' => 'index')); ?>