yet another template converted to language neutral format

diff --git a/mod/display.php b/mod/display.php
index edbadbc75a86f2a563613f60cee88fb7e5b50c91..096ea16c9b7d432b3de449008866e7c8ddd0d482 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -151,7 +151,12 @@ function display_content(&$a) {
 
                        if(can_write_wall($a,$a->profile['uid'])) {
                                if($item['id'] == $item['parent']) {
-                                       $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+                                       $likebuttons = replace_macros($like_tpl,array(
+                                               '$id' => $item['id'],
+                                               '$likethis' => t("I like this \x28toggle\x29"),
+                                               '$nolike' => t("I don't like this \x28toggle\x29"),
+                                               '$wait' => t('Please wait') 
+                                       ));
                                }
                                if($item['last-child']) {
                                        $comment = replace_macros($cmnt_tpl,array(

diff --git a/mod/network.php b/mod/network.php
index 1ef4ab37232a2bc4e170a9ef15cc05ac42f0649b..6f9e84b7086224597b0f34e2e4463043dcaddbdd 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -360,7 +360,12 @@ function network_content(&$a, $update = 0) {
 
                        $likebuttons = '';
                        if($item['id'] == $item['parent']) {
-                               $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+                               $likebuttons = replace_macros($like_tpl,array(
+                                       '$id' => $item['id'],
+                                       '$likethis' => t("I like this \x28toggle\x29"),
+                                       '$nolike' => t("I don't like this \x28toggle\x29"),
+                                       '$wait' => t('Please wait') 
+                               ));
                        }
 
                        if($item['last-child']) {

diff --git a/mod/photos.php b/mod/photos.php
index c1c6a4133f99436104552c441545a333748bb64c..7d3e57616a1f43ddd6fabe713d93a900a93bd08e 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1033,8 +1033,14 @@ function photos_content(&$a) {
 
                        $likebuttons = '';
 
-                       if($can_post || can_write_wall($a,$owner_uid))
-                               $likebuttons = replace_macros($like_tpl,array('$id' => $link_item['id']));
+                       if($can_post || can_write_wall($a,$owner_uid)) {
+                               $likebuttons = replace_macros($like_tpl,array(
+                                       '$id' => $item['id'],
+                                       '$likethis' => t("I like this \x28toggle\x29"),
+                                       '$nolike' => t("I don't like this \x28toggle\x29"),
+                                       '$wait' => t('Please wait') 
+                               ));
+                       }
 
                        if(! count($r)) {
                                $o .= '<div id="photo-like-div">';

diff --git a/mod/profile.php b/mod/profile.php
index b23af2e6635aeed42077c33843d183ff2abc1d24..9375b670bc6ba99c01f77322f006de9fb3e8d057 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -302,7 +302,12 @@ function profile_content(&$a, $update = 0) {
 
                        if(can_write_wall($a,$a->profile['profile_uid'])) {
                                if($item['id'] == $item['parent']) {
-                                       $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+                                       $likebuttons = replace_macros($like_tpl,array(
+                                               '$id' => $item['id'],
+                                               '$likethis' => t("I like this \x28toggle\x29"),
+                                               '$nolike' => t("I don't like this \x28toggle\x29"),
+                                               '$wait' => t('Please wait') 
+                                       ));
                                }
                                if($item['last-child']) {
                                        $comment = replace_macros($cmnt_tpl,array(

diff --git a/util/strings.php b/util/strings.php
index 71b1d776b78fb0ad1e497d63059881c1e8ed071f..b010cb9fc048f8134ba8a1a3f29ddf8f422e338a 100644 (file)
--- a/util/strings.php
+++ b/util/strings.php
@@ -192,6 +192,8 @@ $a->strings['Cancel'] = 'Cancel';
 $a->strings['Global Directory'] = 'Global Directory';
 $a->strings['Item not found.'] = 'Item not found.';
 $a->strings['Private Message'] = 'Private Message';
+$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
+$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29";
 $a->strings['This is you'] = 'This is you';
 $a->strings['Delete'] = 'Delete';
 $a->strings['View $name\'s profile'] = 'View $name\'s profile';
@@ -370,11 +372,12 @@ $a->strings['Your registration is pending approval by the site owner.'] = 'Your
 $a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.";
 $a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.';
 $a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: ";
+$a->strings['Members of this network prefer to communicate with real people who use their real names.'] = 'Members of this network prefer to communicate with real people who use their real names.';
 $a->strings['Include your profile in member directory?'] = 'Include your profile in member directory?';
 $a->strings['Registration'] = 'Registration';
 $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': ';
 $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 profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'] = 'Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.';
 $a->strings['Choose a nickname: '] = 'Choose a nickname: ';
 $a->strings['Please login.'] = 'Please login.';
 $a->strings['Registration revoked for '] = 'Registration revoked for ';

diff --git a/util/typo.php b/util/typo.php
index ac837efe5028d5daf28c71ef39a012a2e7481dfe..ac61ef6d35396ce2b192d74675e25d4388acdb74 100644 (file)
--- a/util/typo.php
+++ b/util/typo.php
@@ -35,4 +35,14 @@
                        echo $file . "\n";
                        include_once($file);
                }
-       }
\ No newline at end of file
+       }
+
+       echo "String files\n";
+
+       echo 'util/strings.php' . "\n";
+       include_once('util/strings.php');
+       $files = glob('view/*/strings.php');
+       foreach($files as $file) {
+               echo $file . "\n";
+               include_once($file);
+       }

diff --git a/view/de/like.tpl b/view/de/like.tpl
deleted file mode 100644 (file)
index 2f77885..0000000
--- a/view/de/like.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-                               <img src="images/like.gif" alt="Ich mag das" title="Ich mag das [toggle]" onclick="dolike($id,'like');" />
-                               <img src="images/dislike.gif" alt="Ich mag das nicht" title="Ich mag das nicht [toggle]" onclick="dolike($id,'dislike');" />
-                               <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Bitte warten" title="Bitte warten" style="display: none;" />
-                       </div>

diff --git a/view/de/strings.php b/view/de/strings.php
index 002749df913052459abf16964a5951676748d68e..b45ddee696ed5ec265f9dffe71048aa1f652fee7 100644 (file)
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -173,6 +173,8 @@ $a->strings['Submit Request'] = 'Anfrage abschicken';
 $a->strings['Cancel'] = 'Abbrechen';
 $a->strings['Global Directory'] = 'Weltweites Verzeichnis';
 $a->strings['Private Message'] = 'Private Nachricht';
+$a->strings["I like this \x28toggle\x29"] = "Ich mag das \x28toggle\x29";
+$a->strings["I don't like this \x28toggle\x29"] = "Ich mag das nicht \x28toggle\x29";
 $a->strings['This is you'] = 'Das bist du';
 $a->strings['View $name\'s profile'] = 'Betrachte das Profil von $name';
 $a->strings['View $owner_name\'s profile'] = 'Betrachte das Profil von $owner_name';

diff --git a/view/en/like.tpl b/view/en/like.tpl
deleted file mode 100644 (file)
index 1c385e5..0000000
--- a/view/en/like.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-                               <img src="images/like.gif" alt="I like this" title="I like this [toggle]" onclick="dolike($id,'like');" />
-                               <img src="images/dislike.gif" alt="I don't like this" title="I don't like this [toggle]" onclick="dolike($id,'dislike');" />
-                               <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
-                       </div>

diff --git a/view/fr/like.tpl b/view/fr/like.tpl
deleted file mode 100644 (file)
index 1c385e5..0000000
--- a/view/fr/like.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-                               <img src="images/like.gif" alt="I like this" title="I like this [toggle]" onclick="dolike($id,'like');" />
-                               <img src="images/dislike.gif" alt="I don't like this" title="I don't like this [toggle]" onclick="dolike($id,'dislike');" />
-                               <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
-                       </div>

diff --git a/view/fr/strings.php b/view/fr/strings.php
index b6b20f68c1e3f4eb48b7434e9f8406e27a840739..423645c86262b905feae626792b5cbdfc1e8efab 100644 (file)
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -159,6 +159,8 @@ $a->strings['Cancel'] = 'Annuler';
 $a->strings['Global Directory'] = 'Annuaire global';
 $a->strings['Item not found.'] = 'Élément introuvable.';
 $a->strings['Private Message'] = 'Message privé';
+$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
+$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29";
 $a->strings['This is you'] = 'C\'est vous';
 $a->strings['View $name\'s profile'] = 'Voir le profil de $name';
 $a->strings['Item has been removed.'] = 'Cet élément a été enlevé.';

diff --git a/view/it/like.tpl b/view/it/like.tpl
deleted file mode 100644 (file)
index d64349a..0000000
--- a/view/it/like.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-                               <img src="images/like.gif" alt="Mi piace questo" title="Mi piace questo [metti/togli]" onclick="dolike($id,'like');" />
-                               <img src="images/dislike.gif" alt="Non mi piace questo" title="Non mi piace questo [metti/togli]" onclick="dolike($id,'dislike');" />
-                               <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Attendi" title="Attendi" style="display: none;" />
-                       </div>

diff --git a/view/it/strings.php b/view/it/strings.php
index 1cee5399a820f18436598196de57c8f74918c16b..437d6e7c6fa62980c28f282a4ffed4bdb777c39c 100644 (file)
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -138,6 +138,8 @@ $a->strings['Cancel'] = 'Annulla';
 $a->strings['Global Directory'] = 'Elenco Globale';
 $a->strings['Item not found.'] = 'Elemento non trovato.';
 $a->strings['Private Message'] = 'Messaggio privato';
+$a->strings["I like this \x28toggle\x29"] = "Mi piace questo \x28metti/togli\x29";
+$a->strings["I don't like this \x28toggle\x29"] = "Non mi piace questo \x28metti/togli\x29";
 $a->strings['This is you'] = 'Questo sei tu';
 $a->strings['View $name\'s profile'] = 'Guarda il profilo di $name';
 $a->strings['View $owner_name\'s profile'] = 'Guarda il profilo di $owner_name';

diff --git a/view/like.tpl b/view/like.tpl
new file mode 100644 (file)
index 0000000..e36a624
--- /dev/null
+++ b/view/like.tpl
@@ -0,0 +1,5 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+                               <img src="images/like.gif" alt="$likethis" title="$likethis" onclick="dolike($id,'like');" />
+                               <img src="images/dislike.gif" alt="$nolike" title="$nolike" onclick="dolike($id,'dislike');" />
+                               <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+                       </div>