From 0de88eb6b0e5ceab470240a54414317884a49101 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 8 Mar 2011 18:53:52 -0800 Subject: [PATCH] yet another template converted to language neutral format --- mod/display.php | 7 ++++++- mod/network.php | 7 ++++++- mod/photos.php | 10 ++++++++-- mod/profile.php | 7 ++++++- util/strings.php | 5 ++++- util/typo.php | 12 +++++++++++- view/de/like.tpl | 5 ----- view/de/strings.php | 2 ++ view/en/like.tpl | 5 ----- view/fr/like.tpl | 5 ----- view/fr/strings.php | 2 ++ view/it/like.tpl | 5 ----- view/it/strings.php | 2 ++ view/like.tpl | 5 +++++ 14 files changed, 52 insertions(+), 27 deletions(-) delete mode 100644 view/de/like.tpl delete mode 100644 view/en/like.tpl delete mode 100644 view/fr/like.tpl delete mode 100644 view/it/like.tpl create mode 100644 view/like.tpl diff --git a/mod/display.php b/mod/display.php index edbadbc75..096ea16c9 100644 --- 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 1ef4ab372..6f9e84b70 100644 --- 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 c1c6a4133..7d3e57616 100644 --- 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 .= '
'; diff --git a/mod/profile.php b/mod/profile.php index b23af2e66..9375b670b 100644 --- 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 71b1d776b..b010cb9fc 100644 --- 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 \'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 profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.'] = 'Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.'; $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 ac837efe5..ac61ef6d3 100644 --- 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 index 2f778851a..000000000 --- a/view/de/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/view/de/strings.php b/view/de/strings.php index 002749df9..b45ddee69 100644 --- 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 index 1c385e5de..000000000 --- a/view/en/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/view/fr/like.tpl b/view/fr/like.tpl deleted file mode 100644 index 1c385e5de..000000000 --- a/view/fr/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/view/fr/strings.php b/view/fr/strings.php index b6b20f68c..423645c86 100644 --- 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 index d64349a4b..000000000 --- a/view/it/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/view/it/strings.php b/view/it/strings.php index 1cee5399a..437d6e7c6 100644 --- 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 index 000000000..e36a624a4 --- /dev/null +++ b/view/like.tpl @@ -0,0 +1,5 @@ +