From 746bc1e81fc3f953d21051386058d195223688e4 Mon Sep 17 00:00:00 2001 From: Espen Lorentzen Date: Sun, 11 Aug 2013 18:56:45 +0200 Subject: [PATCH 01/20] Inital Norwgian (NB) translation --- .../language/norwegian/date_lang.php | 61 ++++++++++++++++ .../norwegian/form_validation_lang.php | 35 +++++++++ .../language/norwegian/stikked_lang.php | 71 +++++++++++++++++++ 3 files changed, 167 insertions(+) create mode 100644 htdocs/application/language/norwegian/date_lang.php create mode 100644 htdocs/application/language/norwegian/form_validation_lang.php create mode 100644 htdocs/application/language/norwegian/stikked_lang.php diff --git a/htdocs/application/language/norwegian/date_lang.php b/htdocs/application/language/norwegian/date_lang.php new file mode 100644 index 0000000..c0ace16 --- /dev/null +++ b/htdocs/application/language/norwegian/date_lang.php @@ -0,0 +1,61 @@ + Date: Sun, 11 Aug 2013 19:00:48 +0200 Subject: [PATCH 02/20] Initial translation date_lang, do I need to change the timezone values? --- .../language/norwegian/date_lang.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/application/language/norwegian/date_lang.php b/htdocs/application/language/norwegian/date_lang.php index c0ace16..7b49b97 100644 --- a/htdocs/application/language/norwegian/date_lang.php +++ b/htdocs/application/language/norwegian/date_lang.php @@ -1,19 +1,19 @@ Date: Sun, 11 Aug 2013 19:09:07 +0200 Subject: [PATCH 03/20] Letters displayed wrong in Linux, edited with UTF-8 encoding --- .../language/norwegian/date_lang.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/application/language/norwegian/date_lang.php b/htdocs/application/language/norwegian/date_lang.php index 7b49b97..3506bd7 100644 --- a/htdocs/application/language/norwegian/date_lang.php +++ b/htdocs/application/language/norwegian/date_lang.php @@ -1,18 +1,18 @@ Date: Sun, 11 Aug 2013 19:11:21 +0200 Subject: [PATCH 04/20] Changed location of file --- htdocs/application/language/norwegian/date_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/application/language/norwegian/date_lang.php b/htdocs/application/language/norwegian/date_lang.php index 3506bd7..cc4ce21 100644 --- a/htdocs/application/language/norwegian/date_lang.php +++ b/htdocs/application/language/norwegian/date_lang.php @@ -58,4 +58,4 @@ $lang['UP14'] = '(UTC +14:00) Line Islands'; /* End of file date_lang.php */ -/* Location: ./system/language/english/date_lang.php */ +/* Location: ./system/language/norwegian/date_lang.php */ From c2578eaae739cca821be222e852c6023f37bc226 Mon Sep 17 00:00:00 2001 From: Espen Lorentzen Date: Sun, 11 Aug 2013 19:12:47 +0200 Subject: [PATCH 05/20] Changed location description --- htdocs/application/language/norwegian/form_validation_lang.php | 2 +- htdocs/application/language/norwegian/stikked_lang.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/application/language/norwegian/form_validation_lang.php b/htdocs/application/language/norwegian/form_validation_lang.php index 035192e..ee4bde8 100644 --- a/htdocs/application/language/norwegian/form_validation_lang.php +++ b/htdocs/application/language/norwegian/form_validation_lang.php @@ -32,4 +32,4 @@ $lang['greater_than'] = "The %s field must contain a number greater than %s."; /* End of file form_validation_lang.php */ -/* Location: ./system/language/english/form_validation_lang.php */ +/* Location: ./system/language/norwegian/form_validation_lang.php */ diff --git a/htdocs/application/language/norwegian/stikked_lang.php b/htdocs/application/language/norwegian/stikked_lang.php index 0eef887..c31f194 100644 --- a/htdocs/application/language/norwegian/stikked_lang.php +++ b/htdocs/application/language/norwegian/stikked_lang.php @@ -68,4 +68,3 @@ $lang['table_lang'] = 'Language'; $lang['table_hits'] = 'Hits'; $lang['table_time'] = 'When'; $lang['powered_by'] = 'Powered by'; - From 01002db239812d7410971684629ac4814b9de378 Mon Sep 17 00:00:00 2001 From: esplor Date: Tue, 13 Aug 2013 18:12:37 +0200 Subject: [PATCH 06/20] Update stikked_lang.php --- .../language/norwegian/stikked_lang.php | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/htdocs/application/language/norwegian/stikked_lang.php b/htdocs/application/language/norwegian/stikked_lang.php index c31f194..5dc3429 100644 --- a/htdocs/application/language/norwegian/stikked_lang.php +++ b/htdocs/application/language/norwegian/stikked_lang.php @@ -1,44 +1,44 @@ Date: Tue, 13 Aug 2013 18:41:53 +0200 Subject: [PATCH 07/20] Changed to Norwegian - Small letters for minutes, months etc --- .../language/norwegian/date_lang.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/application/language/norwegian/date_lang.php b/htdocs/application/language/norwegian/date_lang.php index cc4ce21..728afa3 100644 --- a/htdocs/application/language/norwegian/date_lang.php +++ b/htdocs/application/language/norwegian/date_lang.php @@ -1,19 +1,19 @@ Date: Tue, 13 Aug 2013 19:10:19 +0200 Subject: [PATCH 08/20] =?UTF-8?q?Norwgian=20(Bokm=C3=A5l)=20complete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../language/norwegian/stikked_lang.php | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/htdocs/application/language/norwegian/stikked_lang.php b/htdocs/application/language/norwegian/stikked_lang.php index 5dc3429..25d7782 100644 --- a/htdocs/application/language/norwegian/stikked_lang.php +++ b/htdocs/application/language/norwegian/stikked_lang.php @@ -1,7 +1,7 @@ Date: Tue, 13 Aug 2013 19:16:44 +0200 Subject: [PATCH 09/20] Begin translation --- .../norwegian/form_validation_lang.php | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/htdocs/application/language/norwegian/form_validation_lang.php b/htdocs/application/language/norwegian/form_validation_lang.php index ee4bde8..c6d274e 100644 --- a/htdocs/application/language/norwegian/form_validation_lang.php +++ b/htdocs/application/language/norwegian/form_validation_lang.php @@ -1,33 +1,33 @@ Date: Tue, 13 Aug 2013 19:22:07 +0200 Subject: [PATCH 10/20] Changed all The %s.. to Feltet %s --- .../norwegian/form_validation_lang.php | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/htdocs/application/language/norwegian/form_validation_lang.php b/htdocs/application/language/norwegian/form_validation_lang.php index c6d274e..12ddfb6 100644 --- a/htdocs/application/language/norwegian/form_validation_lang.php +++ b/htdocs/application/language/norwegian/form_validation_lang.php @@ -8,27 +8,27 @@ $lang['robot'] = "Robot, stikk av!"; $lang['empty'] = "Feltet %s kan ikke være tomt."; $lang['valid_lang'] = "Please select your language."; $lang['isset'] = "Feltet %s må ha en verdi."; -$lang['valid_email'] = "The %s field must contain a valid email address."; -$lang['valid_emails'] = "The %s field must contain all valid email addresses."; -$lang['valid_url'] = "The %s field must contain a valid URL."; -$lang['valid_ip'] = "The %s field must contain a valid IP."; -$lang['min_length'] = "The %s field must be at least %s characters in length."; -$lang['max_length'] = "The %s field can not exceed %s characters in length."; -$lang['exact_length'] = "The %s field must be exactly %s characters in length."; -$lang['alpha'] = "The %s field may only contain alphabetical characters."; -$lang['alpha_numeric'] = "The %s field may only contain alpha-numeric characters."; -$lang['alpha_dash'] = "The %s field may only contain alpha-numeric characters, underscores, and dashes."; -$lang['numeric'] = "The %s field must contain only numbers."; -$lang['is_numeric'] = "The %s field must contain only numeric characters."; -$lang['integer'] = "The %s field must contain an integer."; -$lang['regex_match'] = "The %s field is not in the correct format."; -$lang['matches'] = "The %s field does not match the %s field."; -$lang['is_unique'] = "The %s field must contain a unique value."; -$lang['is_natural'] = "The %s field must contain only positive numbers."; -$lang['is_natural_no_zero'] = "The %s field must contain a number greater than zero."; -$lang['decimal'] = "The %s field must contain a decimal number."; -$lang['less_than'] = "The %s field must contain a number less than %s."; -$lang['greater_than'] = "The %s field must contain a number greater than %s."; +$lang['valid_email'] = "Feltet %s field must contain a valid email address."; +$lang['valid_emails'] = "Feltet %s field must contain all valid email addresses."; +$lang['valid_url'] = "Feltet %s field must contain a valid URL."; +$lang['valid_ip'] = "Feltet %s field must contain a valid IP."; +$lang['min_length'] = "Feltet %s field must be at least %s characters in length."; +$lang['max_length'] = "Feltet %s field can not exceed %s characters in length."; +$lang['exact_length'] = "Feltet %s field must be exactly %s characters in length."; +$lang['alpha'] = "Feltet %s field may only contain alphabetical characters."; +$lang['alpha_numeric'] = "Feltet %s field may only contain alpha-numeric characters."; +$lang['alpha_dash'] = "Feltet %s field may only contain alpha-numeric characters, underscores, and dashes."; +$lang['numeric'] = "Feltet %s field must contain only numbers."; +$lang['is_numeric'] = "Feltet %s field must contain only numeric characters."; +$lang['integer'] = "Feltet %s field must contain an integer."; +$lang['regex_match'] = "Feltet %s field is not in the correct format."; +$lang['matches'] = "Feltet %s field does not match the %s field."; +$lang['is_unique'] = "Feltet %s field must contain a unique value."; +$lang['is_natural'] = "Feltet %s field must contain only positive numbers."; +$lang['is_natural_no_zero'] = "Feltet %s field must contain a number greater than zero."; +$lang['decimal'] = "Feltet %s field must contain a decimal number."; +$lang['less_than'] = "Feltet %s field must contain a number less than %s."; +$lang['greater_than'] = "Feltet %s field must contain a number greater than %s."; /* End of file form_validation_lang.php */ From 7a8e9ab8cc01a9aa2ab7516856fee8961adffc0f Mon Sep 17 00:00:00 2001 From: Espen Lorentzen Date: Tue, 13 Aug 2013 19:33:19 +0200 Subject: [PATCH 11/20] Tabbed translation for easier editing --- .../language/norwegian/stikked_lang.php | 136 +++++++++--------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/htdocs/application/language/norwegian/stikked_lang.php b/htdocs/application/language/norwegian/stikked_lang.php index 25d7782..a1dc448 100644 --- a/htdocs/application/language/norwegian/stikked_lang.php +++ b/htdocs/application/language/norwegian/stikked_lang.php @@ -1,70 +1,70 @@ Date: Tue, 13 Aug 2013 19:38:29 +0200 Subject: [PATCH 12/20] Forgot no posts yet --- htdocs/application/language/norwegian/stikked_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/application/language/norwegian/stikked_lang.php b/htdocs/application/language/norwegian/stikked_lang.php index a1dc448..634f9ca 100644 --- a/htdocs/application/language/norwegian/stikked_lang.php +++ b/htdocs/application/language/norwegian/stikked_lang.php @@ -42,7 +42,7 @@ $lang['paste_fullwidth'] = 'til full bredde av nettleser'; $lang['paste_replies'] = 'Svar til'; $lang['paste_replyto'] = 'Svar til'; $lang['paste_replyto_desc'] = 'Her kan du svare til posten ovenfor'; -$lang['paste_missing'] = 'There have been no Pastes'; +$lang['paste_missing'] = 'Ingen poster opprettet enda '; $lang['paste_spam'] = 'Spam beskyttelse'; $lang['paste_spam_desc'] = 'Skriv inn bokstavene'; $lang['exp_forever'] = 'Ikke slett'; From 7d76e03c40dd926ba26c731dea6cc538e2aa2bd8 Mon Sep 17 00:00:00 2001 From: esplor Date: Tue, 13 Aug 2013 19:53:36 +0200 Subject: [PATCH 13/20] Update form_validation_lang.php --- .../norwegian/form_validation_lang.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/application/language/norwegian/form_validation_lang.php b/htdocs/application/language/norwegian/form_validation_lang.php index 12ddfb6..b50db7b 100644 --- a/htdocs/application/language/norwegian/form_validation_lang.php +++ b/htdocs/application/language/norwegian/form_validation_lang.php @@ -1,23 +1,23 @@ Date: Tue, 13 Aug 2013 20:09:11 +0200 Subject: [PATCH 14/20] Update date_lang.php --- htdocs/application/language/norwegian/date_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/application/language/norwegian/date_lang.php b/htdocs/application/language/norwegian/date_lang.php index 728afa3..ac816a4 100644 --- a/htdocs/application/language/norwegian/date_lang.php +++ b/htdocs/application/language/norwegian/date_lang.php @@ -58,4 +58,4 @@ $lang['UP14'] = '(UTC +14:00) Line Islands'; /* End of file date_lang.php */ -/* Location: ./system/language/norwegian/date_lang.php */ +/* Location: ./application/language/norwegian/date_lang.php */ From d0394389a147a3741c1d2a9c76550d8644cd4bd7 Mon Sep 17 00:00:00 2001 From: esplor Date: Tue, 13 Aug 2013 20:17:32 +0200 Subject: [PATCH 15/20] Update form_validation_lang.php --- .../norwegian/form_validation_lang.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/application/language/norwegian/form_validation_lang.php b/htdocs/application/language/norwegian/form_validation_lang.php index b50db7b..6194329 100644 --- a/htdocs/application/language/norwegian/form_validation_lang.php +++ b/htdocs/application/language/norwegian/form_validation_lang.php @@ -1,7 +1,7 @@ Date: Thu, 15 Aug 2013 17:33:36 +0200 Subject: [PATCH 16/20] Changed recent paste from nylig to fersk, according to w3dictionary --- htdocs/application/config/stikked.php | 2 +- .../language/norwegian/form_validation_lang.php | 2 +- htdocs/application/language/norwegian/stikked_lang.php | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php index c0a8c0c..9b3c2b5 100644 --- a/htdocs/application/config/stikked.php +++ b/htdocs/application/config/stikked.php @@ -38,7 +38,7 @@ $config['theme'] = 'default'; * Currently: english, german, swissgerman, spanish * */ -$config['language'] = 'english'; +$config['language'] = 'norwegian'; /** * Combine JS & CSS files (recommended) diff --git a/htdocs/application/language/norwegian/form_validation_lang.php b/htdocs/application/language/norwegian/form_validation_lang.php index 6194329..e64e7bb 100644 --- a/htdocs/application/language/norwegian/form_validation_lang.php +++ b/htdocs/application/language/norwegian/form_validation_lang.php @@ -21,7 +21,7 @@ $lang['alpha_dash'] = "Feltet %s kan bare inneholde alfanumeriske tegn, underst $lang['numeric'] = "Feltet %s må kun inneholde tall."; $lang['is_numeric'] = "Feltet %s må kun inneholde numeriske tegn."; $lang['integer'] = "Feltet %s må inneholde et heltall."; -$lang['regex_match'] = "Feltet %s er ikke i korrekt format."; +$lang['regex_match'] = "Feltet %s har ikke korrekt format."; $lang['matches'] = "Feltet %s er ikke lik feltet %s."; $lang['is_unique'] = "Feltet %s må inneholde en unik verdi."; $lang['is_natural'] = "Feltet %s må inneholde positive nummer."; diff --git a/htdocs/application/language/norwegian/stikked_lang.php b/htdocs/application/language/norwegian/stikked_lang.php index 634f9ca..d37c3ce 100644 --- a/htdocs/application/language/norwegian/stikked_lang.php +++ b/htdocs/application/language/norwegian/stikked_lang.php @@ -15,10 +15,10 @@ $lang['paste_disablesynhl'] = 'Ikke uthev syntaks'; $lang['paste_shorturl'] = 'Kort URL'; $lang['paste_shorturl_desc'] = 'Oppretter en kortere URL som videresender til original post?'; $lang['paste_private'] = 'Privat'; -$lang['paste_private_desc'] = 'Privat post vil ikke vises i nylige oppføringer.'; +$lang['paste_private_desc'] = 'Privat post vil ikke vises i ferske oppføringer.'; $lang['paste_delete'] = 'Slett etter'; $lang['paste_delete_desc'] = 'Når skal posten slettes?'; -$lang['paste_recent'] = 'Nylige poster'; +$lang['paste_recent'] = 'Ferske poster'; $lang['paste_trending'] = 'Populære poster'; $lang['paste_from'] = 'Av'; $lang['paste_ago'] = 'siden'; @@ -56,8 +56,8 @@ $lang['exp_4w'] = '4 uker'; $lang['paste_create'] = 'Opprett'; $lang['menu_create'] = 'Opprett'; $lang['menu_create_title'] = 'Opprett en ny post'; -$lang['menu_recent'] = 'Nylig'; -$lang['menu_recent_title'] = 'Nylige poster'; +$lang['menu_recent'] = 'Ferske'; +$lang['menu_recent_title'] = 'Ferske poster'; $lang['menu_trending'] = 'Populære'; $lang['menu_trending_title'] = 'Populære poster'; $lang['menu_api'] = 'API'; From 3fb9c54d2fb6babb546b1e50e5b3b39ce8f4d59e Mon Sep 17 00:00:00 2001 From: Espen Lorentzen Date: Sat, 17 Aug 2013 17:50:06 +0200 Subject: [PATCH 17/20] Added support for table prefix --- htdocs/application/config/database.php | 2 +- htdocs/application/config/stikked.php | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/htdocs/application/config/database.php b/htdocs/application/config/database.php index af6c2fa..1466923 100644 --- a/htdocs/application/config/database.php +++ b/htdocs/application/config/database.php @@ -55,7 +55,7 @@ $db['default']['username'] = $CI->config->item('db_username'); $db['default']['password'] = $CI->config->item('db_password'); $db['default']['database'] = $CI->config->item('db_database'); $db['default']['dbdriver'] = 'mysql'; -$db['default']['dbprefix'] = ''; +$db['default']['dbprefix'] = $CI->config->item('db_prefix'); $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php index 9b3c2b5..5a940f3 100644 --- a/htdocs/application/config/stikked.php +++ b/htdocs/application/config/stikked.php @@ -15,10 +15,20 @@ $config['site_name'] = 'Stikked'; * The database structure will be created automatically * */ -$config['db_hostname'] = '127.0.0.1'; -$config['db_database'] = 'stikked'; -$config['db_username'] = 'stikked'; -$config['db_password'] = 'stikked'; +$config['db_hostname'] = '127.0.0.1'; +$config['db_database'] = 'stikked'; +$config['db_username'] = 'stikked'; +$config['db_password'] = 'stikked'; + +/** + * Table prefix + * Generate table prefix for stikked db, commonly used if the webhoster only have one db. + * Use underscore as suffix to easily see the tables. + * use $config['db_password'] = ''; if you dont want to use table prefix. +*/ + +$config['db_prefix'] = 'stikked_'; + /** * Theme From 73e86fb6f71a237a63c5471a4644510439f6ab9e Mon Sep 17 00:00:00 2001 From: Espen Lorentzen Date: Sat, 17 Aug 2013 17:52:13 +0200 Subject: [PATCH 18/20] Typo in db_prefix --- htdocs/application/config/stikked.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php index 5a940f3..82a616a 100644 --- a/htdocs/application/config/stikked.php +++ b/htdocs/application/config/stikked.php @@ -24,7 +24,7 @@ $config['db_password'] = 'stikked'; * Table prefix * Generate table prefix for stikked db, commonly used if the webhoster only have one db. * Use underscore as suffix to easily see the tables. - * use $config['db_password'] = ''; if you dont want to use table prefix. + * use $config['db_prefix'] = ''; if you dont want to use table prefix. */ $config['db_prefix'] = 'stikked_'; From 61f768c5573a7fa1a603ab275c518e33e6c276d5 Mon Sep 17 00:00:00 2001 From: Espen Lorentzen Date: Sat, 17 Aug 2013 17:56:30 +0200 Subject: [PATCH 19/20] Add support for norwegian --- htdocs/application/config/stikked.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php index 82a616a..dd127cb 100644 --- a/htdocs/application/config/stikked.php +++ b/htdocs/application/config/stikked.php @@ -45,7 +45,7 @@ $config['theme'] = 'default'; * * Which language to use * Translate Stikked to your own language, see htdocs/application/language files - * Currently: english, german, swissgerman, spanish + * Currently: english, german, swissgerman, spanish, norwegian * */ $config['language'] = 'norwegian'; From d18b538ff3c5fc830e3dd90b5bd71e26b353e59f Mon Sep 17 00:00:00 2001 From: Espen Lorentzen Date: Sat, 17 Aug 2013 17:58:35 +0200 Subject: [PATCH 20/20] Put english back as default language --- htdocs/application/config/stikked.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php index dd127cb..1701980 100644 --- a/htdocs/application/config/stikked.php +++ b/htdocs/application/config/stikked.php @@ -48,7 +48,7 @@ $config['theme'] = 'default'; * Currently: english, german, swissgerman, spanish, norwegian * */ -$config['language'] = 'norwegian'; +$config['language'] = 'english'; /** * Combine JS & CSS files (recommended)