From 15780914eca543bf14dbf211bcbf7d18e3553639 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 23 Feb 2011 19:30:57 -0800 Subject: [PATCH] another template made language neutral --- boot.php | 7 ++++++- util/strings.php | 5 ++++- view/de/register-link.tpl | 1 - view/en/register-link.tpl | 1 - view/fr/register-link.tpl | 1 - view/it/register-link.tpl | 1 - view/register-link.tpl | 1 + 7 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 view/de/register-link.tpl delete mode 100644 view/en/register-link.tpl delete mode 100644 view/fr/register-link.tpl delete mode 100644 view/it/register-link.tpl create mode 100644 view/register-link.tpl diff --git a/boot.php b/boot.php index d9786edcd5..8de891f383 100644 --- a/boot.php +++ b/boot.php @@ -768,7 +768,12 @@ function escape_tags($string) { if(! function_exists('login')) { function login($register = false) { $o = ""; - $register_html = (($register) ? load_view_file("view/register-link.tpl") : ""); + $register_tpl = (($register) ? load_view_file("view/register-link.tpl") : ""); + + $register_html = replace_macros($register_tpl,array( + '$title' => t('Create a New Account'), + '$desc' => t('Register') + )); $noid = get_config('system','no_openid'); if($noid) { diff --git a/util/strings.php b/util/strings.php index 747d8ef48f..f1fb57751a 100644 --- a/util/strings.php +++ b/util/strings.php @@ -3,6 +3,8 @@ $a->strings['Not Found'] = 'Not Found'; $a->strings['Page not found.' ] = 'Page not found.' ; $a->strings['Permission denied'] = 'Permission denied'; $a->strings['Permission denied.'] = 'Permission denied.'; +$a->strings['Create a New Account'] = 'Create a New Account'; +$a->strings['Register'] = 'Register'; $a->strings['Nickname or Email address: '] = 'Nickname or Email address: '; $a->strings['Password: '] = 'Password: '; $a->strings['Login'] = 'Login'; @@ -361,7 +363,6 @@ $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Yo $a->strings['Your Email Address: '] = 'Your Email Address: '; $a->strings['Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'nickname@$sitename\'.'] = 'Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'nickname@$sitename\'.'; $a->strings['Choose a nickname: '] = 'Choose a nickname: '; -$a->strings['Register'] = 'Register'; $a->strings['Please login.'] = 'Please login.'; $a->strings['Registration revoked for '] = 'Registration revoked for '; $a->strings['Account approved.'] = 'Account approved.'; @@ -508,6 +509,8 @@ $a->strings['File has an invalid extension, it should be one of '] = 'File has a $a->strings['Upload was cancelled, or server error encountered'] = 'Upload was cancelled, or server error encountered'; $a->strings['Randplace Settings'] = 'Randplace Settings'; $a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin'; +$a->strings['Post to StatusNet'] = 'Post to StatusNet'; +$a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Settings'; $a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'; $a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key'; $a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret'; diff --git a/view/de/register-link.tpl b/view/de/register-link.tpl deleted file mode 100644 index cf9d7976d1..0000000000 --- a/view/de/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - Registrieren diff --git a/view/en/register-link.tpl b/view/en/register-link.tpl deleted file mode 100644 index 7f3fca4d6c..0000000000 --- a/view/en/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - Register diff --git a/view/fr/register-link.tpl b/view/fr/register-link.tpl deleted file mode 100644 index 7f3fca4d6c..0000000000 --- a/view/fr/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - Register diff --git a/view/it/register-link.tpl b/view/it/register-link.tpl deleted file mode 100644 index 67fc37b228..0000000000 --- a/view/it/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - Registrati diff --git a/view/register-link.tpl b/view/register-link.tpl new file mode 100644 index 0000000000..802c5f99f0 --- /dev/null +++ b/view/register-link.tpl @@ -0,0 +1 @@ + $desc