Skip to content

Commit

Permalink
The end of multilingual functionality. Celebration :-)
Browse files Browse the repository at this point in the history
  • Loading branch information
@scoumbourdis
scoumbourdis committed Dec 19, 2011
1 parent 5150b5c commit b1de734
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 23 deletions.
4 changes: 2 additions & 2 deletions application/libraries/grocery_crud.php
View file
Expand Up @@ -1428,7 +1428,7 @@ protected function get_datetime_input($field_info,$value)
$this->set_js('assets/grocery_crud/js/jquery_plugins/jquery.ui.datetime.js'); $this->set_js('assets/grocery_crud/js/jquery_plugins/jquery.ui.datetime.js');
$this->set_js('assets/grocery_crud/js/jquery_plugins/config/jquery.datetime.config.js'); $this->set_js('assets/grocery_crud/js/jquery_plugins/config/jquery.datetime.config.js');
$input = "<input name='{$field_info->name}' type='text' value='$value' maxlength='19' class='datetime-input' /> $input = "<input name='{$field_info->name}' type='text' value='$value' maxlength='19' class='datetime-input' />
<button class='datetime-input-clear'>Clear</button> <button class='datetime-input-clear'>".$this->l('form_button_clear')."</button>
(yyyy-mm-dd) hh:mm:ss"; (yyyy-mm-dd) hh:mm:ss";
return $input; return $input;
} }
Expand Down Expand Up @@ -1458,7 +1458,7 @@ protected function get_date_input($field_info,$value)
$this->set_js('assets/grocery_crud/js/jquery_plugins/jquery-ui-1.8.10.custom.min.js'); $this->set_js('assets/grocery_crud/js/jquery_plugins/jquery-ui-1.8.10.custom.min.js');
$this->set_js('assets/grocery_crud/js/jquery_plugins/config/jquery.datepicker.config.js'); $this->set_js('assets/grocery_crud/js/jquery_plugins/config/jquery.datepicker.config.js');
$input = "<input name='{$field_info->name}' type='text' value='$value' maxlength='10' class='datepicker-input' /> $input = "<input name='{$field_info->name}' type='text' value='$value' maxlength='10' class='datepicker-input' />
<button class='datepicker-input-clear'>Clear</button> (yyyy-mm-dd)"; <button class='datepicker-input-clear'>".$this->l('form_button_clear')."</button> (yyyy-mm-dd)";
return $input; return $input;
} }


Expand Down
3 changes: 1 addition & 2 deletions assets/grocery_crud/css/other/fileuploader/fileuploader.css
View file
Expand Up @@ -2,8 +2,7 @@


.qq-upload-button { .qq-upload-button {
display:block; /* or inline-block */ display:block; /* or inline-block */
width: 105px; padding: 7px 15px;
padding: 7px 11px;
text-align:center; text-align:center;
background:#ddd; background:#ddd;
border:1px solid #AAA; border:1px solid #AAA;
Expand Down
2 changes: 1 addition & 1 deletion assets/grocery_crud/js/other/fileuploader.js
View file
Expand Up @@ -486,7 +486,7 @@ qq.FileUploader = function(o){


template: '<div class="qq-uploader">' + template: '<div class="qq-uploader">' +
'<div class="qq-upload-drop-area"><span>Drop files here to upload</span></div>' + '<div class="qq-upload-drop-area"><span>Drop files here to upload</span></div>' +
'<div class="qq-upload-button">Upload a file</div>' + '<div class="qq-upload-button">'+upload_a_file_string+'</div>' +
'<ul class="qq-upload-list"></ul>' + '<ul class="qq-upload-list"></ul>' +
'</div>', '</div>',


Expand Down
11 changes: 10 additions & 1 deletion assets/grocery_crud/languages/english.php
View file
Expand Up @@ -4,11 +4,17 @@
$lang['list_page'] = 'Page'; $lang['list_page'] = 'Page';
$lang['list_paging_of'] = 'of'; $lang['list_paging_of'] = 'of';
$lang['list_displaying'] = 'Displaying {start} to {end} of {results} items'; $lang['list_displaying'] = 'Displaying {start} to {end} of {results} items';
$lang['list_search'] = 'Search'; $lang['list_filtered_from'] = '(filtered from {total_results} total entries)';
$lang['list_show_entries'] = 'Show {paging} entries';
$lang['list_search'] = 'Search:';
$lang['list_search_all'] = 'Search all'; $lang['list_search_all'] = 'Search all';
$lang['list_clear_filtering'] = 'Clear filtering'; $lang['list_clear_filtering'] = 'Clear filtering';
$lang['list_delete'] = 'Delete'; $lang['list_delete'] = 'Delete';
$lang['list_edit'] = 'Edit'; $lang['list_edit'] = 'Edit';
$lang['list_paging_first'] = 'First';
$lang['list_paging_previous'] = 'Previous';
$lang['list_paging_next'] = 'Next';
$lang['list_paging_last'] = 'Last';


$lang['form_edit'] = 'Edit'; $lang['form_edit'] = 'Edit';
$lang['form_back_to_list'] = 'Back to list'; $lang['form_back_to_list'] = 'Back to list';
Expand All @@ -24,6 +30,9 @@
$lang['form_save'] = 'Save'; $lang['form_save'] = 'Save';
$lang['form_insert_loading'] = 'Loading, saving data...'; $lang['form_insert_loading'] = 'Loading, saving data...';


$lang['form_upload_a_file'] = 'Upload a file';
$lang['form_button_clear'] = 'Clear';

$lang['delete_success_message'] = 'Your data has been successfully deleted from the database.'; $lang['delete_success_message'] = 'Your data has been successfully deleted from the database.';
$lang['delete_error_message'] = 'Your data was not deleted from the database.'; $lang['delete_error_message'] = 'Your data was not deleted from the database.';


Expand Down
13 changes: 11 additions & 2 deletions assets/grocery_crud/languages/greek.php
View file
Expand Up @@ -3,12 +3,18 @@
$lang['list_actions'] = 'Εργαλεία'; $lang['list_actions'] = 'Εργαλεία';
$lang['list_page'] = 'Σελίδα'; $lang['list_page'] = 'Σελίδα';
$lang['list_paging_of'] = 'από'; $lang['list_paging_of'] = 'από';
$lang['list_displaying'] = 'Εμφάνιση {start} μέχρι {end} από {results} αποτελέσματα'; $lang['list_displaying'] = 'Εμφάνιση {start} έως {end} από {results} εγγραφές';
$lang['list_search'] = 'Αναζήτηση'; $lang['list_filtered_from'] = '(φιλτραρισμένες από {total_results} συνολικά εγγραφές)';
$lang['list_show_entries'] = 'Εμφάνιση {paging} εγγραφών';
$lang['list_search'] = 'Αναζήτηση:';
$lang['list_search_all'] = 'Αναζήτηση όλων'; $lang['list_search_all'] = 'Αναζήτηση όλων';
$lang['list_clear_filtering'] = 'Καθαρισμός φίλτρων'; $lang['list_clear_filtering'] = 'Καθαρισμός φίλτρων';
$lang['list_delete'] = 'Διαγραφή'; $lang['list_delete'] = 'Διαγραφή';
$lang['list_edit'] = 'Επεξεργασία'; $lang['list_edit'] = 'Επεξεργασία';
$lang['list_paging_first'] = 'Πρώτη';
$lang['list_paging_previous'] = 'Προηγούμενη';
$lang['list_paging_next'] = 'Επόμενη';
$lang['list_paging_last'] = 'Τελευταία';


$lang['form_edit'] = 'Επεξεργασία'; $lang['form_edit'] = 'Επεξεργασία';
$lang['form_back_to_list'] = 'Επιστροφή στην λίστα'; $lang['form_back_to_list'] = 'Επιστροφή στην λίστα';
Expand All @@ -24,6 +30,9 @@
$lang['form_save'] = 'Αποθήκευση'; $lang['form_save'] = 'Αποθήκευση';
$lang['form_insert_loading'] = 'Αναμονή...'; $lang['form_insert_loading'] = 'Αναμονή...';


$lang['form_upload_a_file'] = 'Εισαγωγή αρχείου';
$lang['form_button_clear'] = 'Καθαρισμός';

$lang['delete_success_message'] = 'Τα δεδομένα σας διαγράφτηκαν με επιτυχία απο την βάση δεδομένων.'; $lang['delete_success_message'] = 'Τα δεδομένα σας διαγράφτηκαν με επιτυχία απο την βάση δεδομένων.';
$lang['delete_error_message'] = 'Τα δεδομένα σας δεν διαγράφτηκαν απο το σύστημα.'; $lang['delete_error_message'] = 'Τα δεδομένα σας δεν διαγράφτηκαν απο το σύστημα.';


Expand Down
31 changes: 16 additions & 15 deletions assets/grocery_crud/themes/datatables/js/datatables.js
View file
Expand Up @@ -3,21 +3,22 @@ $(document).ready(function() {
"bJQueryUI": true, "bJQueryUI": true,
"sPaginationType": "full_numbers", "sPaginationType": "full_numbers",
"bStateSave": true, "bStateSave": true,
/* multilingual functionality */ "oLanguage":{
"sProcessing": "Processing...", "sProcessing": "Processing...",
"sLengthMenu": "Show _MENU_ entries", "sLengthMenu": show_entries_string,
"sZeroRecords": "No matching records found", "sZeroRecords": "No matching records found",
"sInfo": "Showing _START_ to _END_ of _TOTAL_ entries", "sInfo": displaying_paging_string,
"sInfoEmpty": "Showing 0 to 0 of 0 entries", "sInfoEmpty": "Showing 0 to 0 of 0 entries",
"sInfoFiltered": "(filtered from _MAX_ total entries)", "sInfoFiltered": filtered_from_string,
"sSearch": "Search:", "sSearch": search_string,
"oPaginate": { "oPaginate": {
"sFirst": "First", "sFirst": paging_first,
"sPrevious": "Previous", "sPrevious": paging_previous,
"sNext": "Next", "sNext": paging_next,
"sLast": "Last" "sLast": paging_last
} }
/* -------------------------- */ }

}); });


$('a[role=button]').live("mouseover mouseout", function(event) { $('a[role=button]').live("mouseover mouseout", function(event) {
Expand Down
2 changes: 2 additions & 0 deletions assets/grocery_crud/themes/datatables/views/add.php
View file
Expand Up @@ -9,6 +9,8 @@
?> ?>
<script type='text/javascript'> <script type='text/javascript'>
var base_url = '<?php echo base_url();?>'; var base_url = '<?php echo base_url();?>';

var upload_a_file_string = '<?php echo $this->l('form_upload_a_file');?>';
</script> </script>
<div class='ui-widget-content ui-corner-all datatables'> <div class='ui-widget-content ui-corner-all datatables'>
<h3 class="ui-accordion-header ui-helper-reset ui-state-default form-title"> <h3 class="ui-accordion-header ui-helper-reset ui-state-default form-title">
Expand Down
2 changes: 2 additions & 0 deletions assets/grocery_crud/themes/datatables/views/edit.php
View file
Expand Up @@ -9,6 +9,8 @@
?> ?>
<script type='text/javascript'> <script type='text/javascript'>
var base_url = '<?php echo base_url();?>'; var base_url = '<?php echo base_url();?>';

var upload_a_file_string = '<?php echo $this->l('form_upload_a_file');?>';
</script> </script>
<div class='ui-widget-content ui-corner-all datatables'> <div class='ui-widget-content ui-corner-all datatables'>
<h3 class="ui-accordion-header ui-helper-reset ui-state-default form-title"> <h3 class="ui-accordion-header ui-helper-reset ui-state-default form-title">
Expand Down
14 changes: 14 additions & 0 deletions assets/grocery_crud/themes/datatables/views/list_template.php
View file
Expand Up @@ -12,6 +12,20 @@
<script type='text/javascript'> <script type='text/javascript'>
var base_url = '<?php echo base_url();?>'; var base_url = '<?php echo base_url();?>';
var subject = '<?php echo $subject?>'; var subject = '<?php echo $subject?>';

var displaying_paging_string = "<?php echo str_replace( array('{start}','{end}','{results}'),
array('_START_', '_END_', '_TOTAL_'),
$this->l('list_displaying')
); ?>";
var filtered_from_string = "<?php echo str_replace('{total_results}','_MAX_',$this->l('list_filtered_from') ); ?>";
var show_entries_string = "<?php echo str_replace('{paging}','_MENU_',$this->l('list_show_entries') ); ?>";
var search_string = "<?php echo $this->l('list_search'); ?>";

var paging_first = "<?php echo $this->l('list_paging_first'); ?>";
var paging_previous = "<?php echo $this->l('list_paging_previous'); ?>";
var paging_next = "<?php echo $this->l('list_paging_next'); ?>";
var paging_last = "<?php echo $this->l('list_paging_last'); ?>";

</script> </script>
<?php <?php
if(!empty($actions)){ if(!empty($actions)){
Expand Down
2 changes: 2 additions & 0 deletions assets/grocery_crud/themes/flexigrid/views/add.php
View file
Expand Up @@ -7,6 +7,8 @@
?> ?>
<script type='text/javascript'> <script type='text/javascript'>
var base_url = '<?php echo base_url();?>'; var base_url = '<?php echo base_url();?>';

var upload_a_file_string = '<?php echo $this->l('form_upload_a_file');?>';
</script> </script>
<div class="flexigrid" style='width: 100%;'> <div class="flexigrid" style='width: 100%;'>
<div class="mDiv"> <div class="mDiv">
Expand Down
2 changes: 2 additions & 0 deletions assets/grocery_crud/themes/flexigrid/views/edit.php
View file
Expand Up @@ -7,6 +7,8 @@
?> ?>
<script type='text/javascript'> <script type='text/javascript'>
var base_url = '<?php echo base_url();?>'; var base_url = '<?php echo base_url();?>';

var upload_a_file_string = '<?php echo $this->l('form_upload_a_file');?>';
</script> </script>
<div class="flexigrid" style='width: 100%;'> <div class="flexigrid" style='width: 100%;'>
<div class="mDiv"> <div class="mDiv">
Expand Down

0 comments on commit b1de734

Please sign in to comment.