Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 903

Přidáno uživatelem Jiří Sviták před více než 13 roky(ů)

Opraveno prirazovani neidentifikovanych prevodu. Uprava chyboveho hlaseni, prelozeno do ceskeho jazyka, nove v ceskem jazyce zobrazuje presny vyskyt chyby, predtim bylo jen v anglictine. V profilu uzivatele pridana prislusnost do skupiny uzivatelskych prav.

Zobrazit rozdíly:

freenetis/branches/testing/application/i18n/cs_CZ/texts.php
'please choose language' => 'Prosím vyberte jazyk',
'please enter the code you received in an sms message' => 'Prosím vložte kód, který jste obdrželi v SMS zprávě',
'please fill in the form with information about your association' => 'Prosím, vyplňte formulář údaji o vašem sdružení',
'please report this error as bug using form below' => 'Nahlaště prosím tuto chybu jako bug tímto formulářem',
'please select a method of obtaining a password and follow the instructions' => 'Prosím zvolte způsob získání hesla a pokračujte dle instrukcí',
'please use button to save form' => 'Použijte prosím tlačítko pro uložení formuláře',
'polarization' => 'Polarizace',
......
'send date' => 'Datum odeslání',
'send e-mail' => 'Pošli e-mail',
'send e-mail notification after expiration' => 'Poslat zprávu na e-mail po vypršení přesměrování',
'send error report' => 'Zaslat chybové hlášení',
'send money to other account' => 'Poslat peníze na jiný účet',
'send sms' => 'Pošli SMS',
'send sms message' => 'Poslat SMS zprávu',
......
'sent message' => 'Odeslaná zpráva',
'september' => 'Září',
'service' => 'Služba',
'server error' => 'Chyba serveru',
'settings' => 'Nastavení',
'settings for configuration files has been successfully updated' => 'Nastavení pro kofigurační soubory bylo úspěšně upraveno',
'setup config' => 'Nastavení konfigurace',
freenetis/branches/testing/application/i18n/cs_CZ/core.php
<?php defined('SYSPATH') or die('No direct access allowed.');
$lang = array
(
'display stack trace' => 'Zobrazit trasování zásobníku',
'error_message' => 'Chyba se vyskytla na <strong>řádku %s</strong> souboru <strong>%s</strong>.',
'please report this error as bug using form below' => 'Nahlašte prosím tuto chybu jako bug tímto formulářem',
'send error report' => 'Zaslat chybové hlášení',
'server error' => 'Chyba serveru',
'stack_trace' => 'Trasování zásobníku',
'stats_footer' => 'Načteno za {execution_time} sekund, použito {memory_usage} paměti. Generovánou Kohanou v{kohana_version}.',
'unknown error' => 'Neznámá chyba',
);
?>
freenetis/branches/testing/application/models/user.php
", array($number, $country_code))->current();
}
public function get_aro_groups_of_user($user_id)
{
return $this->db->query("
SELECT ag.id, ag.name
FROM aro_groups ag
JOIN groups_aro_map gam ON ag.id = gam.group_id
JOIN aro a ON a.id = gam.aro_id
WHERE a.id = $user_id
");
}
}
?>
freenetis/branches/testing/application/controllers/users.php
{
$voip = html::anchor(url_lang::base().'voip/show/'.$voip->current()->user_id,$voip->current()->name);
}
$aro_groups = $model_users->get_aro_groups_of_user($user_id);
$view = new View('main');
$view->title = url_lang::lang('texts.Display user');
$view->content = new View('users_show');
......
$view->content->contact_types = $arr_contact_types;
$view->content->message = $this->session->get_once('message');
$view->content->voip = $voip;
$view->content->aro_groups = $aro_groups;
$view->render(TRUE);
} // end of show function
freenetis/branches/testing/application/controllers/bank_transfers.php
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Payment'));
$form->dropdown('name')->label(url_lang::lang('texts.Destination credit account').':')->options($arr_accounts)->selected(0);
$form->input('correct_vs')->label(url_lang::lang('texts.Or enter correct variable symbol').':')->callback(array($this, 'valid_var_sym'));
$form->input('correct_vs')->label(url_lang::lang('texts.Or enter correct variable symbol').':')->callback(array($this, 'valid_correct_vs'));
$form->input('text')->label(url_lang::lang('texts.Text').':')->rules('required')->value(url_lang::lang('texts.Assigning of unidentified payment'));
$form->group('')->label(url_lang::lang('texts.Penalty'));
$form->input('penalty')->label(url_lang::lang('texts.Penalty').':')->value($penalty_fee)->rules('valid_numeric');
......
$t->member_id = $member_id;
$t->save_throwable();
// then we create a new transfer to the selected member's account
/*
$t->clear();
$t->member_id = $member_id;
$t->origin_id = $bt->destination_id;
$t->destination_id = $dst_id;
$t->previous_transfer_id = $bt->id;
$t->user_id = $this->session->get('user_id');
$t->datetime = $bt->datetime;
$t->creation_datetime = $time_now;
$t->text = $form_data['text'];
$t->amount = $bt->amount;
$identified_saved = $t->save();
*/
Transfer_Model::insert_transfer($bt->destination_id, $dst_id, $bt->id, $member_id,
$user_id, null, $bt->datetime, $creation_datetime, $form_data['text'], $bt->amount);
......
foreach ($next_ts as $transfer)
{
$transfer->member_id = $member_id;
$transfer->save_trowable();
$transfer->save_throwable();
}
// also penalty should be generated
$operating = ORM::factory('account')->where('account_attribute_id', Account_attribute_Model::$operating)->find();
if ($form_data['penalty'] > 0)
{
/*
$pen = new Transfer_Model();
$pen->origin_id = $dst_id;
$pen->destination_id = $operating->id;
$pen->previous_transfer_id = $bt->id;
$pen->user_id = $this->session->get('user_id');
$pen->datetime = $bt->datetime;
$pen->creation_datetime = $time_now;
$pen->text = $form_data['penalty_text'];
$pen->amount = $form_data['penalty'];
$pen_save = $pen->save();
*/
Transfer_Model::insert_transfer($dst_id, $operating->id, $bt->id, null,
$user_id, null, $bt->datetime, $creation_datetime, $form_data['penalty_text'], $form_data['penalty']);
}
// transfer fee, if it has to be generated
if ($form_data['transfer_fee'] > 0)
{
/*
$tf = new Transfer_Model();
$tf->origin_id = $dst_id;
$tf->destination_id = $operating->id;
$tf->previous_transfer_id = $bt->id;
$tf->user_id = $this->session->get('user_id');
$tf->datetime = $bt->datetime;
$tf->creation_datetime = $time_now;
$tf->text = $form_data['fee_text'];
$tf->amount = $form_data['transfer_fee'];
$tf_saved = $tf->save();
*/
Transfer_Model::insert_transfer($dst_id, $operating->id, $bt->id, null,
$user_id, null, $bt->datetime, $creation_datetime, $form_data['fee_text'], $form_data['transfer_fee']);
}
......
/**
* Function validates variable symbol.
* Do not control by javascript! Let it possible to leave variable symbol empty.
* Target account for assigning unidentified transfer can be selected separately.
* @author Jiri Svitak
* @param $input
* @return unknown_type
*/
function valid_var_sym($input)
function valid_correct_vs($input)
{
if ($this->input->post('name') == 0)
{
freenetis/branches/testing/application/views/users_show.php
<td><?php echo $voip ?></td>
</tr>
<?php } ?>
<tr>
<th colspan="2"><?php echo url_lang::lang('texts.Access rights') ?></th>
</tr>
<?php foreach ($aro_groups as $aro_group):?>
<tr>
<th><?php echo url_lang::lang('texts.Group') ?></th>
<td><?php echo url_lang::lang('texts.'.$aro_group->name) ?></td>
</tr>
<?php endforeach; ?>
</table>
freenetis/branches/testing/system/core/Kohana.php
else
{
$level = 1;
$error = $PHP_ERROR ? 'Unknown Error' : get_class($exception);
$error = $PHP_ERROR ? Kohana::lang('core.Unknown error') : get_class($exception);
$description = '';
}
}
freenetis/branches/testing/system/views/kohana_error_page.php
</head>
<body>
<div id="wrap">
<h1><?php echo url_lang::lang('texts.Server error') ?></h1>
<p><?php echo url_lang::lang('texts.Please report this error as bug using form below') ?>:</p>
<h1><?php echo Kohana::lang('core.Server error') ?></h1>
<p><?php echo Kohana::lang('core.Please report this error as bug using form below') ?>:</p>
<form action="<?php echo url_lang::base() ?>email/send_email_to_developers" class="form" method="post" style="margin-bottom: 20px">
<table cellspacing="4" class="form">
<tr>
......
</tr>
<tr>
<td><label for="udescription"><?php echo url_lang::lang('texts.Description') ?>:</label></td>
<td><textarea name="udescription" class="required" style="width: 380px; height: 100px;"><?php echo url_lang::lang('texts.Describe what you have been doing, when the error came out') ?>...</textarea></td>
<td><textarea cols="80" rows="20"name="udescription" class="required" style="width: 380px; height: 100px;"><?php echo url_lang::lang('texts.Describe what you have been doing, when the error came out') ?>...</textarea></td>
</tr>
<tr>
<td></td>
<td><input type="submit" value="<?php echo url_lang::lang('texts.Send error report') ?>" /></td>
<td><input type="submit" value="<?php echo Kohana::lang('core.Send error report') ?>" /></td>
</tr>
<input type="hidden" name="line" value="<?php echo ($line ? $line : -1); ?>" />
<input type="hidden" name="file" value="<?php echo ($file ? $line : -1); ?>" />
......
<?php endif; ?>
<?php if (isset($trace)): ?>
<h3><?php echo Kohana::lang('core.stack_trace') ?></h3>
<p><a href="#" id="link_stack_trace">Display stack trace informations</a></p>
<div id="stack_trace_message" style="display: none;"><?php echo $trace ?></div>
<?php echo $trace ?>
<?php endif; ?>
<p id="stats"><?php echo Kohana::lang('core.stats_footer') ?></p>
</div>

Také k dispozici: Unified diff