diff --git a/htdocs/application/config/autoload.php b/htdocs/application/config/autoload.php index 7f49443..7431c5d 100644 --- a/htdocs/application/config/autoload.php +++ b/htdocs/application/config/autoload.php @@ -96,7 +96,7 @@ $autoload['config'] = array('stikked'); | */ -$autoload['language'] = array(); +$autoload['language'] = array('stikked'); /* diff --git a/htdocs/application/config/config.php b/htdocs/application/config/config.php index 3ec5aca..7375342 100644 --- a/htdocs/application/config/config.php +++ b/htdocs/application/config/config.php @@ -69,7 +69,7 @@ $config['url_suffix'] = ''; | than english. | */ -$config['language'] = 'english'; +$config['language'] = 'swissgerman'; /* |-------------------------------------------------------------------------- diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php index f34a020..18158ea 100644 --- a/htdocs/application/controllers/main.php +++ b/htdocs/application/controllers/main.php @@ -239,7 +239,6 @@ class Main extends CI_Controller $this->dbforge->add_key('hits_updated'); $this->dbforge->add_column('pastes', $fields); } - $this->lang->load('stikked', 'english'); } function _form_prep($lang = false, $title = '', $paste = '', $reply = false) @@ -605,7 +604,7 @@ class Main extends CI_Controller $ip_firstpart = $ip[0] . '.' . $ip[1] . '.'; //setup message - $this->form_validation->set_message('_valid_ip', 'You are not allowed to paste.'); + $this->form_validation->set_message('_valid_ip', lang('not_allowed')); //lookup $this->db->select('ip_address, spam_attempts'); diff --git a/htdocs/application/language/english/stikked_lang.php b/htdocs/application/language/english/stikked_lang.php index cb324b7..c234ab8 100644 --- a/htdocs/application/language/english/stikked_lang.php +++ b/htdocs/application/language/english/stikked_lang.php @@ -17,6 +17,28 @@ $lang['paste_private'] = 'Private'; $lang['paste_private_desc'] = 'Private paste aren\'t shown in recent listings.'; $lang['paste_delete'] = 'Delete After'; $lang['paste_delete_desc'] = 'When should we delete your paste?'; +$lang['paste_trending'] = 'Trending Pastes'; +$lang['paste_from'] = 'From'; +$lang['paste_ago'] = 'ago'; +$lang['paste_writtenin'] = 'written in'; +$lang['paste_viewed'] = 'viewed'; +$lang['paste_times'] = 'times'; +$lang['paste_isareply'] = 'This paste is a reply to'; +$lang['paste_viewdiff'] = 'view diff'; +$lang['paste_viewdiffs'] = 'Viewing differences between'; +$lang['paste_goback'] = 'go back'; +$lang['paste_url'] = 'URL'; +$lang['paste_shorturl'] = 'Shorturl'; +$lang['paste_embed'] = 'Embed'; +$lang['paste_download'] = 'Download Paste'; +$lang['paste_or'] = 'or'; +$lang['paste_and'] = 'and'; +$lang['paste_viewraw'] = 'View Raw'; +$lang['paste_expand'] = 'Expand Paste'; +$lang['paste_fullwidth'] = 'to full width of browser'; +$lang['paste_replies'] = 'Replies to'; +$lang['paste_replyto'] = 'Reply to'; +$lang['paste_replyto_desc'] = 'Here you can reply to the paste above'; $lang['exp_forever'] = 'Keep Forever'; $lang['exp_30min'] = '30 Minutes'; $lang['exp_1h'] = '1 Hour'; diff --git a/htdocs/application/language/swissgerman/date_lang.php b/htdocs/application/language/swissgerman/date_lang.php new file mode 100644 index 0000000..1570d52 --- /dev/null +++ b/htdocs/application/language/swissgerman/date_lang.php @@ -0,0 +1,61 @@ +">
There have been no pastes :(
+:(
diff --git a/htdocs/themes/default/views/list_ips.php b/htdocs/themes/default/views/list_ips.php index 7acb77f..ed4b805 100644 --- a/htdocs/themes/default/views/list_ips.php +++ b/htdocs/themes/default/views/list_ips.php @@ -38,7 +38,7 @@ -There have been no pastes :(
+:(
diff --git a/htdocs/themes/default/views/spam_detail.php b/htdocs/themes/default/views/spam_detail.php index 9b4ea69..2397898 100644 --- a/htdocs/themes/default/views/spam_detail.php +++ b/htdocs/themes/default/views/spam_detail.php @@ -51,7 +51,7 @@ -There have been no pastes :(
+:(
diff --git a/htdocs/themes/default/views/trends.php b/htdocs/themes/default/views/trends.php index 2656722..7dee877 100644 --- a/htdocs/themes/default/views/trends.php +++ b/htdocs/themes/default/views/trends.php @@ -1,5 +1,5 @@ load->view('defaults/header');?> -There have been no pastes :(
+:(
diff --git a/htdocs/themes/default/views/view/embed.php b/htdocs/themes/default/views/view/embed.php index b8b45cf..940aada 100644 --- a/htdocs/themes/default/views/view/embed.php +++ b/htdocs/themes/default/views/view/embed.php @@ -57,9 +57,6 @@ $this->carabiner->display('css'); load->view('defaults/stats'); - ?> diff --git a/htdocs/themes/default/views/view/view.php b/htdocs/themes/default/views/view/view.php index 218a829..e7bcbcc 100644 --- a/htdocs/themes/default/views/view/view.php +++ b/htdocs/themes/default/views/view/view.php @@ -16,31 +16,31 @@ if(isset($insert)){Title | -Name | -When | ++ | + | "> | - | ago. | +. | @@ -104,8 +104,8 @@ if(isset($insert)){ load->view('defaults/paste_form', $reply_form); ?> diff --git a/htdocs/themes/default/views/view/view_footer.php b/htdocs/themes/default/views/view/view_footer.php index d518b38..a5d6707 100644 --- a/htdocs/themes/default/views/view/view_footer.php +++ b/htdocs/themes/default/views/view/view_footer.php @@ -4,9 +4,6 @@ //codemirror modes echo ' '; -//stats -$this->load->view('defaults/stats'); - //Javascript $this->carabiner->js('jquery.js'); $this->carabiner->js('jquery.timers.js');
---|