Skip to content

Wrap strings for translation and add zh_TW po file. #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theralse wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Wrap strings for translation and add zh_TW po file. #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b999a85
Wrapped strings for translation.
Aug 15, 2020
8c4b1ad
Add webzash.po (zh_TW)
Aug 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Controller/AccountsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions Controller/ReportsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])) {
Expand Down Expand Up @@ -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);
Expand All @@ -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']))
));
}
Expand Down
Loading