another template made language neutral

diff --git a/boot.php b/boot.php
index d9786edcd5af64d44b01f034f4182366d4a68501..8de891f3831fc72f527bfa69537243253019ceae 100644 (file)
--- 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 747d8ef48f85cd9fd7663a62d2b47db2f0c6e338..f1fb57751a63a1c407d9e2430d98fffc7ab21a9c 100644 (file)
--- 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 \'<strong>nickname@$sitename</strong>\'.'] = 'Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.';
 $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.<br />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.<br />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 (file)
index cf9d797..0000000
--- a/view/de/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-       <a href="register" name="Neuen Account anlegen" id="register-link" >Registrieren</a>

diff --git a/view/en/register-link.tpl b/view/en/register-link.tpl
deleted file mode 100644 (file)
index 7f3fca4..0000000
--- a/view/en/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-       <a href="register" name="Create a New Account" id="register-link" >Register</a>

diff --git a/view/fr/register-link.tpl b/view/fr/register-link.tpl
deleted file mode 100644 (file)
index 7f3fca4..0000000
--- a/view/fr/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-       <a href="register" name="Create a New Account" id="register-link" >Register</a>

diff --git a/view/it/register-link.tpl b/view/it/register-link.tpl
deleted file mode 100644 (file)
index 67fc37b..0000000
--- a/view/it/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-       <a href="register" name="Crea un nuovo account" id="register-link" >Registrati</a>

diff --git a/view/register-link.tpl b/view/register-link.tpl
new file mode 100644 (file)
index 0000000..802c5f9
--- /dev/null
+++ b/view/register-link.tpl
@@ -0,0 +1 @@
+       <a href="register" title = "$title" id="register-link" >$desc</a>