Skip to content

Wrap translation. (Obsolete) #146

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

Closed
theralse wants to merge 6 commits into from
Closed

Wrap translation. (Obsolete) #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3bdbcce
Update defaultnavbar.ctp
theralse Aug 14, 2020
4e1d79c
Update AccountsController.php
theralse Aug 14, 2020
e92f829
Update defaultnavbar.ctp
theralse Aug 14, 2020
d2f46e5
Bug fix in AccountsController.php
Aug 15, 2020
e08fac0
Add webzash.po (zh_TW)
Aug 15, 2020
126946d
Delete webzash.po
theralse 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
2 changes: 1 addition & 1 deletion View/Dashboard/index.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ if (!extension_loaded('bcmath')) {
</tr>
<tr>
<td><?php echo __d('webzash', 'Financial Year'); ?></td>
<td><?php echo dateFromSql(Configure::read('Account.startdate')) . ' to ' . dateFromSql(Configure::read('Account.enddate')); ?></td>
<td><?php echo dateFromSql(Configure::read('Account.startdate')) . __d('webzash', ' to ') . dateFromSql(Configure::read('Account.enddate')); ?></td>
</tr>
<tr>
<td><?php echo __d('webzash', 'Status'); ?></td>
Expand Down
2 changes: 1 addition & 1 deletion View/Elements/accountinfo.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<br />';
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'));
}
}
4 changes: 2 additions & 2 deletions View/Elements/defaultnavbar.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<li><?php echo $this->Html->link(__d('webzash', 'Accounts'), array('plugin' => 'webzash', 'controller' => 'accounts', 'action' => 'show')); ?></li>
<li><?php echo '<li>' . $this->Html->link(__d('webzash', 'Entries'), array('plugin' => 'webzash', 'controller' => 'entries', 'action' => 'index')); ?></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Reports <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo (__d('webzash', 'Reports ')); ?><b class="caret"></b></a>
<ul class="dropdown-menu">
<li><?php echo '<li>' . $this->Html->link(__d('webzash', 'Balance Sheet'), array('plugin' => 'webzash', 'controller' => 'reports', 'action' => 'balancesheet')); ?></li>
<li><?php echo '<li>' . $this->Html->link(__d('webzash', 'Profit & Loss'), array('plugin' => 'webzash', 'controller' => 'reports', 'action' => 'profitloss')); ?></li>
Expand All @@ -68,7 +68,7 @@
<li><span><?php echo $this->Html->link(__d('webzash', 'Administer'), array('plugin' => 'webzash', 'controller' => 'admin', 'action' => 'index'), array('class' => 'btn btn-danger navbar-btn')); ?></span> &nbsp; &nbsp;</li>
<?php endif; ?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Profile <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo (__d('webzash', 'Profile ')); ?><b class="caret"></b></a>
<ul class="dropdown-menu">
<li><?php echo $this->Html->link(__d('webzash', 'Update Profile'), array('plugin' => 'webzash', 'controller' => 'wzusers', 'action' => 'profile')); ?></li>
<li><?php echo $this->Html->link(__d('webzash', 'Change Password'), array('plugin' => 'webzash', 'controller' => 'wzusers', 'action' => 'changepass')); ?></li>
Expand Down
14 changes: 7 additions & 7 deletions View/Layouts/default.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@
<div id="footer">
<div class="kb-shorcuts">
<ul>
<li>alt + a<span>Chart of Accounts</span></li>
<li>alt + e<span>All Entries</span></li>
<li>alt + l<span>Add Ledger</span></li>
<li>alt + r<span>Add Receipt</span></li>
<li>alt + p<span>Add Payment</span></li>
<li>alt + c<span>Add Contra</span></li>
<li>alt + j<span>Add Journal</span></li>
<li>alt + a<span><?php echo __d('webzash', 'Chart of Accounts'); ?></span></li>
<li>alt + e<span><?php echo __d('webzash', 'All Entries'); ?></span></li>
<li>alt + l<span><?php echo __d('webzash', 'Add Ledger'); ?></span></li>
<li>alt + r<span><?php echo __d('webzash', 'Add Receipt'); ?></span></li>
<li>alt + p<span><?php echo __d('webzash', 'Add Payment'); ?></span></li>
<li>alt + c<span><?php echo __d('webzash', 'Add Contra'); ?></span></li>
<li>alt + j<span><?php echo __d('webzash', 'Add Journal'); ?></span></li>
</ul>
</div>
<div class="credits">
Expand Down
2 changes: 1 addition & 1 deletion View/Reports/balancesheet.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ if (calculate($bsheet['final_liabilities_total'], $bsheet['final_assets_total'],
?>

<div id="accordion">
<h3>Options</h3>
<h3><?php echo __d('webzash', 'Options'); ?></h3>

<div class="balancesheet form">
<?php
Expand Down
2 changes: 1 addition & 1 deletion View/Reports/ledgerentries.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ $(document).ready(function() {
echo $this->Form->input('ledger_id', array('type' => 'select', 'options' => $ledgers, 'escape' => false, 'disabled' => $ledgers_disabled, 'label' => __d('webzash', 'Ledger account')));

echo '<div id="accordion">';
echo '<h3>Options</h3>';
echo '<h3>' . __d('webzash', 'Options') . '</h3>';
echo '<div>';

echo $this->Form->input('startdate', array('label' => __d('webzash', 'Start date')));
Expand Down
2 changes: 1 addition & 1 deletion View/Reports/ledgerstatement.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ $(document).ready(function() {
echo $this->Form->input('ledger_id', array('type' => 'select', 'options' => $ledgers, 'escape' => false, 'disabled' => $ledgers_disabled, 'label' => __d('webzash', 'Ledger account')));

echo '<div id="accordion">';
echo '<h3>Options</h3>';
echo '<h3>' . __d('webzash', 'Options') . '</h3>';
echo '<div>';

echo $this->Form->input('startdate', array('label' => __d('webzash', 'Start date')));
Expand Down
2 changes: 1 addition & 1 deletion View/Reports/profitloss.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ $(document).ready(function() {
</script>

<div id="accordion">
<h3>Options</h3>
<h3><?php echo __d('webzash', 'Options'); ?></h3>

<div class="profitandloss form">
<?php
Expand Down
2 changes: 1 addition & 1 deletion View/Reports/reconciliation.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ $(document).ready(function() {
echo $this->Form->input('ledger_id', array('type' => 'select', 'options' => $ledgers, 'label' => __d('webzash', 'Ledger account')));

echo '<div id="accordion">';
echo '<h3>Options</h3>';
echo '<h3>' . __d('webzash', 'Options') . '</h3>';
echo '<div>';

echo $this->Form->input('showall', array('type' => 'checkbox', 'label' => __d('webzash', 'Show all entries'), 'class' => 'checkbox'));
Expand Down
4 changes: 2 additions & 2 deletions View/Settings/cf.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ $(document).ready(function() {
</tr>
<tr>
<td><?php echo __d('webzash', 'Financial Year'); ?></td>
<td><?php echo dateFromSql(Configure::read('Account.startdate')) . ' to ' . dateFromSql(Configure::read('Account.enddate')); ?></td>
<td><?php echo dateFromSql(Configure::read('Account.startdate')) . __d('webzash', ' to ') . dateFromSql(Configure::read('Account.enddate')); ?></td>
</tr>
<tr>
<td><?php echo __d('webzash', 'Status'); ?></td>
Expand Down Expand Up @@ -110,7 +110,7 @@ $(document).ready(function() {
echo $this->Form->input('fy_start', array('type' => 'text', 'required' => 'required', 'div' => 'form-group required', 'label' => __d('webzash', 'Financial year start')));
echo $this->Form->input('fy_end', array('type' => 'text', 'required' => 'required', 'div' => 'form-group required', 'label' => __d('webzash', 'Financial year end')));

echo "<fieldset><legend>Database Settings</legend>";
echo "<fieldset><legend>" . __d('webzash', 'Database Settings') . "</legend>";
// TODO echo $this->Form->input('create_db', array('type' => 'checkbox', 'label' => __d('webzash', 'Create database if it does not exists')));
echo $this->Form->input('db_datasource', array('type' => 'select', 'options' => $this->Generic->wzaccount_dbtype_options(), 'label' => __d('webzash', 'Database type')));
echo $this->Form->input('db_database', array('label' => __d('webzash', 'Database name')));
Expand Down
2 changes: 1 addition & 1 deletion View/Wzaccounts/create.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ $(document).ready(function() {
echo $this->Form->input('fy_start', array('type' => 'text', 'required' => 'required', 'div' => 'form-group required', 'label' => __d('webzash', 'Financial year start')));
echo $this->Form->input('fy_end', array('type' => 'text', 'required' => 'required', 'div' => 'form-group required', 'label' => __d('webzash', 'Financial year end')));

echo "<fieldset><legend>Database Settings</legend>";
echo "<fieldset><legend>" . __d('webzash', 'Database Settings') . "</legend>";
// TODO echo $this->Form->input('create_db', array('type' => 'checkbox', 'label' => __d('webzash', 'Create database if it does not exists')));
echo $this->Form->input('db_datasource', array('type' => 'select', 'options' => $this->Generic->wzaccount_dbtype_options(), 'label' => __d('webzash', 'Database type')));
echo $this->Form->input('db_database', array('label' => __d('webzash', 'Database name')));
Expand Down