diff options
30 files changed, 123 insertions, 302 deletions
diff --git a/mod/notifications.php b/mod/notifications.php index ed0831aab..c3f8449ed 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -147,17 +147,13 @@ function notifications_content(&$a) { LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid` LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;"); if(($r !== false) && (count($r))) { - $tpl = load_view_file("view/registrations.tpl"); + $o .= '<ul>'; foreach($r as $rr) { - $o .= "<ul>"; - $o .= replace_macros($tpl, array( - '$fullname' => $rr['name'], - '$email' => $rr['email'], - '$approvelink' => "regmod/allow/".$rr['hash'], - '$denylink' => "regmod/deny/".$rr['hash'], - )); - $o .= "</ul>"; + $o .= '<li>' . sprintf('%s (%s) : ', $rr['name'],$rr['email']) + . '<a href="regmod/allow/' . $rr['hash'] .'">' . t('Approve') + . '</a> - <href="regmod/deny/' . $rr['hash'] . '">' . t('Deny') . '</a></li>' . "\r\n"; } + $o .= "</ul>"; } else notice( t('No registrations.') . EOL); diff --git a/mod/profiles.php b/mod/profiles.php index 434f58adf..99812ed88 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -351,6 +351,9 @@ function profiles_content(&$a) { $opt_tpl = load_view_file("view/profile-hide-friends.tpl"); $hide_friends = replace_macros($opt_tpl,array( + '$desc' => t('Hide my contact/friend list from viewers of this profile?'), + '$yes_str' => t('Yes'), + '$no_str' => t('No'), '$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""), '$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "") )); @@ -410,7 +413,14 @@ function profiles_content(&$a) { local_user()); if(count($r)) { - $o .= load_view_file('view/profile_listing_header.tpl'); + $tpl_header = load_view_file('view/profile_listing_header.tpl'); + $o .= replace_macros($tpl_header,array( + '$header' => t('Profiles'), + '$chg_photo' => t('Change profile photo'), + '$cr_new' => t('Create New Profile') + )); + + $tpl_default = load_view_file('view/profile_entry_default.tpl'); $tpl = load_view_file('view/profile_entry.tpl'); diff --git a/mod/settings.php b/mod/settings.php index 72b627d41..646ec55ea 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -285,6 +285,9 @@ function settings_content(&$a) { else { $opt_tpl = load_view_file("view/profile-in-directory.tpl"); $profile_in_dir = replace_macros($opt_tpl,array( + '$desc' => t('Publish your default profile in site directory?'), + '$yes_str' => t('Yes'), + '$no_str' => t('No'), '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""), '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "") )); @@ -294,6 +297,9 @@ function settings_content(&$a) { $opt_tpl = load_view_file("view/profile-in-netdir.tpl"); $profile_in_net_dir = replace_macros($opt_tpl,array( + '$desc' => t('Publish your default profile in global social directory?'), + '$yes_str' => t('Yes'), + '$no_str' => t('No'), '$yes_selected' => (($profile['net-publish']) ? " checked=\"checked\" " : ""), '$no_selected' => (($profile['net-publish'] == 0) ? " checked=\"checked\" " : "") )); diff --git a/util/messages.po b/util/messages.po index 88e1fcd01..e1b15df64 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.1.941\n" +"Project-Id-Version: 2.1.942\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-06 23:01-0700\n" +"POT-Creation-Date: 2011-04-07 17:54-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -53,8 +53,8 @@ msgid "Photo Albums" msgstr "" #: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781 -#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233 -#: ../../mod/photos.php:1244 ../../include/Photo.php:225 +#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1235 +#: ../../mod/photos.php:1246 ../../include/Photo.php:225 #: ../../include/Photo.php:232 ../../include/Photo.php:239 #: ../../include/items.php:1028 ../../include/items.php:1031 #: ../../include/items.php:1034 ../../wip/photos.php:35 @@ -78,7 +78,7 @@ msgstr "" #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 #: ../../mod/message.php:8 ../../mod/message.php:116 #: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 -#: ../../mod/display.php:309 ../../mod/profiles.php:7 +#: ../../mod/display.php:311 ../../mod/profiles.php:7 #: ../../mod/profiles.php:227 ../../mod/invite.php:13 ../../mod/invite.php:50 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:110 #: ../../wip/photos.php:77 ../../wip/photos.php:723 @@ -160,9 +160,10 @@ msgid "No photos selected" msgstr "" #: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066 -#: ../../mod/install.php:123 ../../mod/manage.php:106 ../../mod/group.php:97 -#: ../../mod/group.php:155 ../../mod/invite.php:64 -#: ../../addon/facebook/facebook.php:151 +#: ../../mod/photos.php:1109 ../../mod/install.php:123 +#: ../../mod/manage.php:106 ../../mod/network.php:506 ../../mod/group.php:97 +#: ../../mod/group.php:155 ../../mod/profile.php:395 ../../mod/display.php:174 +#: ../../mod/invite.php:64 ../../addon/facebook/facebook.php:151 #: ../../addon/randplace/randplace.php:179 #: ../../addon/statusnet/statusnet.php:163 #: ../../addon/statusnet/statusnet.php:189 @@ -200,7 +201,7 @@ msgstr "" msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:879 ../../mod/photos.php:1263 ../../wip/photos.php:814 +#: ../../mod/photos.php:879 ../../mod/photos.php:1265 ../../wip/photos.php:814 #: ../../wip/photos.php:1141 ../../wip/photos-chris.php:861 #: ../../wip/photos-chris.php:1188 msgid "View Photo" @@ -291,8 +292,8 @@ msgstr "" msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1106 ../../mod/photos.php:1146 -#: ../../mod/photos.php:1175 ../../mod/network.php:503 +#: ../../mod/photos.php:1106 ../../mod/photos.php:1148 +#: ../../mod/photos.php:1177 ../../mod/network.php:503 #: ../../mod/profile.php:392 ../../mod/display.php:171 #: ../../wip/photos.php:986 ../../wip/photos.php:1025 #: ../../wip/photos.php:1053 ../../wip/photos-chris.php:1033 @@ -300,22 +301,27 @@ msgstr "" msgid "This is you" msgstr "" -#: ../../mod/photos.php:1203 ../../mod/network.php:512 ../../mod/group.php:141 -#: ../../mod/profile.php:438 ../../mod/display.php:238 +#: ../../mod/photos.php:1108 ../../mod/network.php:505 +#: ../../mod/profile.php:394 ../../mod/display.php:173 ../../boot.php:360 +msgid "Comment" +msgstr "" + +#: ../../mod/photos.php:1205 ../../mod/network.php:514 ../../mod/group.php:141 +#: ../../mod/profile.php:440 ../../mod/display.php:240 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1249 ../../wip/photos.php:1127 +#: ../../mod/photos.php:1251 ../../wip/photos.php:1127 #: ../../wip/photos-chris.php:1174 msgid "Recent Photos" msgstr "" -#: ../../mod/photos.php:1253 ../../wip/photos.php:1131 +#: ../../mod/photos.php:1255 ../../wip/photos.php:1131 #: ../../wip/photos-chris.php:1178 msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:1269 ../../wip/photos.php:1147 +#: ../../mod/photos.php:1271 ../../wip/photos.php:1147 #: ../../wip/photos-chris.php:1194 msgid "View Album" msgstr "" @@ -328,8 +334,8 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:62 ../../mod/network.php:511 -#: ../../mod/profile.php:416 ../../mod/display.php:222 +#: ../../mod/editpost.php:62 ../../mod/network.php:513 +#: ../../mod/profile.php:418 ../../mod/display.php:224 msgid "Edit" msgstr "" @@ -519,11 +525,15 @@ msgstr "" msgid "Does $name know you?" msgstr "" -#: ../../mod/dfrn_request.php:620 ../../mod/register.php:436 +#: ../../mod/dfrn_request.php:620 ../../mod/settings.php:289 +#: ../../mod/settings.php:301 ../../mod/register.php:436 +#: ../../mod/profiles.php:355 msgid "Yes" msgstr "" -#: ../../mod/dfrn_request.php:621 ../../mod/register.php:437 +#: ../../mod/dfrn_request.php:621 ../../mod/settings.php:290 +#: ../../mod/settings.php:302 ../../mod/register.php:437 +#: ../../mod/profiles.php:356 msgid "No" msgstr "" @@ -774,7 +784,7 @@ msgstr "" msgid "New Follower" msgstr "" -#: ../../mod/notifications.php:130 +#: ../../mod/notifications.php:130 ../../mod/notifications.php:153 msgid "Approve" msgstr "" @@ -786,7 +796,11 @@ msgstr "" msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/notifications.php:163 +#: ../../mod/notifications.php:154 +msgid "Deny" +msgstr "" + +#: ../../mod/notifications.php:159 msgid "No registrations." msgstr "" @@ -1088,15 +1102,23 @@ msgstr "" msgid " (Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:310 +#: ../../mod/settings.php:288 +msgid "Publish your default profile in site directory?" +msgstr "" + +#: ../../mod/settings.php:300 +msgid "Publish your default profile in global social directory?" +msgstr "" + +#: ../../mod/settings.php:316 msgid "Profile is <strong>not published</strong>." msgstr "" -#: ../../mod/settings.php:353 +#: ../../mod/settings.php:359 msgid "Export Personal Data" msgstr "" -#: ../../mod/settings.php:371 +#: ../../mod/settings.php:377 msgid "Default Post Permissions" msgstr "" @@ -1184,8 +1206,8 @@ msgstr "" msgid "Group: " msgstr "" -#: ../../mod/network.php:330 ../../mod/network.php:561 -#: ../../mod/profile.php:460 ../../mod/display.php:262 +#: ../../mod/network.php:330 ../../mod/network.php:563 +#: ../../mod/profile.php:462 ../../mod/display.php:264 #: ../../mod/search.php:124 msgid "View $name's profile" msgstr "" @@ -1203,24 +1225,24 @@ msgstr "" msgid "See all %d comments" msgstr "" -#: ../../mod/network.php:562 ../../mod/display.php:263 +#: ../../mod/network.php:564 ../../mod/display.php:265 msgid "View $owner_name's profile" msgstr "" -#: ../../mod/network.php:563 ../../mod/display.php:264 +#: ../../mod/network.php:565 ../../mod/display.php:266 msgid "to" msgstr "" -#: ../../mod/network.php:564 ../../mod/display.php:265 +#: ../../mod/network.php:566 ../../mod/display.php:267 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/network.php:565 ../../mod/display.php:266 +#: ../../mod/network.php:567 ../../mod/display.php:268 msgid "via Wall-To-Wall:" msgstr "" -#: ../../mod/network.php:607 ../../mod/register.php:442 -#: ../../mod/profile.php:494 ../../mod/display.php:318 +#: ../../mod/network.php:609 ../../mod/register.php:442 +#: ../../mod/profile.php:496 ../../mod/display.php:320 msgid "" "Shared content is covered by the <a href=\"http://creativecommons.org/" "licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license." @@ -1525,7 +1547,7 @@ msgstr "" msgid "%s posted an update." msgstr "" -#: ../../mod/item.php:598 ../../mod/display.php:15 ../../mod/display.php:313 +#: ../../mod/item.php:598 ../../mod/display.php:15 ../../mod/display.php:315 msgid "Item not found." msgstr "" @@ -1705,7 +1727,7 @@ msgstr "" msgid "following" msgstr "" -#: ../../mod/display.php:306 +#: ../../mod/display.php:308 msgid "Item has been removed." msgstr "" @@ -1763,17 +1785,33 @@ msgstr "" msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:370 +#: ../../mod/profiles.php:354 +msgid "Hide my contact/friend list from viewers of this profile?" +msgstr "" + +#: ../../mod/profiles.php:373 msgid "" "This is your <strong>public</strong> profile.<br />It <strong>may</strong> " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:380 ../../mod/directory.php:91 +#: ../../mod/profiles.php:383 ../../mod/directory.php:91 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:422 +#: ../../mod/profiles.php:418 ../../include/nav.php:110 +msgid "Profiles" +msgstr "" + +#: ../../mod/profiles.php:419 +msgid "Change profile photo" +msgstr "" + +#: ../../mod/profiles.php:420 +msgid "Create New Profile" +msgstr "" + +#: ../../mod/profiles.php:432 msgid "Profile Image" msgstr "" @@ -2465,10 +2503,6 @@ msgstr "" msgid "Settings" msgstr "" -#: ../../include/nav.php:110 -msgid "Profiles" -msgstr "" - #: ../../include/auth.php:27 msgid "Logged out." msgstr "" @@ -2570,10 +2604,6 @@ msgstr "" msgid "Delete this item?" msgstr "" -#: ../../boot.php:360 -msgid "Comment" -msgstr "" - #: ../../boot.php:813 msgid "Create a New Account" msgstr "" diff --git a/util/strings.php b/util/strings.php index a40f36701..9ee31768d 100644 --- a/util/strings.php +++ b/util/strings.php @@ -193,6 +193,7 @@ $a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\ $a->strings['Share'] = 'Share'; $a->strings['Please wait'] = 'Please wait'; $a->strings['This is you'] = 'This is you'; +$a->strings['Submit'] = 'Submit'; $a->strings['Edit'] = 'Edit'; $a->strings['Delete'] = 'Delete'; $a->strings['View $name\'s profile'] = 'View $name\'s profile'; @@ -233,7 +234,6 @@ $a->strings['Group name changed.'] = 'Group name changed.'; $a->strings['Membership list updated.'] = 'Membership list updated.'; $a->strings['Create a group of contacts/friends.'] = 'Create a group of contacts/friends.'; $a->strings['Group Name: '] = 'Group Name: '; -$a->strings['Submit'] = 'Submit'; $a->strings['Group removed.'] = 'Group removed.'; $a->strings['Unable to remove group.'] = 'Unable to remove group.'; $a->strings['Group Editor'] = 'Group Editor'; @@ -365,6 +365,7 @@ $a->strings['New Follower'] = 'New Follower'; $a->strings['Approve'] = 'Approve'; $a->strings['No notifications.'] = 'No notifications.'; $a->strings['User registrations waiting for confirm'] = 'User registrations waiting for confirm'; +$a->strings['Deny'] = 'Deny'; $a->strings['No registrations.'] = 'No registrations.'; $a->strings['Post successful.'] = 'Post successful.'; $a->strings['Login failed.'] = 'Login failed.'; @@ -417,7 +418,11 @@ $a->strings['Profile deleted.'] = 'Profile deleted.'; $a->strings['Profile-'] = 'Profile-'; $a->strings['New profile created.'] = 'New profile created.'; $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.'; +$a->strings['Hide my contact/friend list from viewers of this profile?'] = 'Hide my contact/friend list from viewers of this profile?'; $a->strings['This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'] = 'This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'; +$a->strings['Profiles'] = 'Profiles'; +$a->strings['Change profile photo'] = 'Change profile photo'; +$a->strings['Create New Profile'] = 'Create New Profile'; $a->strings['Profile Image'] = 'Profile Image'; $a->strings['Invalid OpenID url'] = 'Invalid OpenID url'; $a->strings['Please enter the required information.'] = 'Please enter the required information.'; @@ -474,6 +479,8 @@ $a->strings['Automatic Friend Account'] = 'Automatic Friend Account'; $a->strings['Automatically approve all connection/friend requests as friends'] = 'Automatically approve all connection/friend requests as friends'; $a->strings['OpenID: '] = 'OpenID: '; $a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Optional\x29 Allow this OpenID to login to this account."; +$a->strings['Publish your default profile in site directory?'] = 'Publish your default profile in site directory?'; +$a->strings['Publish your default profile in global social directory?'] = 'Publish your default profile in global social directory?'; $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.'; $a->strings['Export Personal Data'] = 'Export Personal Data'; $a->strings['Default Post Permissions'] = 'Default Post Permissions'; @@ -526,7 +533,6 @@ $a->strings['Network'] = 'Network'; $a->strings['Notifications'] = 'Notifications'; $a->strings['Manage'] = 'Manage'; $a->strings['Settings'] = 'Settings'; -$a->strings['Profiles'] = 'Profiles'; $a->strings['Embedding disabled'] = 'Embedding disabled'; $a->strings['Male'] = 'Male'; $a->strings['Female'] = 'Female'; diff --git a/view/de/profile-hide-friends.tpl b/view/de/profile-hide-friends.tpl deleted file mode 100644 index 1d6903825..000000000 --- a/view/de/profile-hide-friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="hide-friends-text"> -Verberge meine Kontaktliste von Leuten die dieses Profil ansehen? -</p> - - <div id="hide-friends-yes-wrapper"> - <label id="hide-friends-yes-label" for="hide-friends-yes">Ja</label> - <input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" /> - - <div id="hide-friends-break" ></div> - </div> - <div id="hide-friends-no-wrapper"> - <label id="hide-friends-no-label" for="hide-friends-no">Nein</label> - <input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0" /> - - <div id="hide-friends-end"></div> - </div> diff --git a/view/de/profile-in-directory.tpl b/view/de/profile-in-directory.tpl deleted file mode 100644 index 9cc62fc69..000000000 --- a/view/de/profile-in-directory.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -Soll dein Standard-Profil im Verzeichnis dieser Seite veröffentlich werden? -</p> - - <div id="profile-in-dir-yes-wrapper"> - <label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Ja</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" /> - - <div id="profile-in-dir-break" ></div> - </div> - <div id="profile-in-dir-no-wrapper"> - <label id="profile-in-dir-no-label" for="profile-in-dir-no">Nein</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0" /> - - <div id="profile-in-dir-end"></div> - </div> diff --git a/view/de/profile-in-netdir.tpl b/view/de/profile-in-netdir.tpl deleted file mode 100644 index 26f45ac90..000000000 --- a/view/de/profile-in-netdir.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -Soll dein Standard-Profil im globalen Verzeichnis veröffentlicht werden? -</p> - - <div id="profile-in-netdir-yes-wrapper"> - <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Ja</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" /> - - <div id="profile-in-netdir-break" ></div> - </div> - <div id="profile-in-netdir-no-wrapper"> - <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">Nein</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" /> - - <div id="profile-in-netdir-end"></div> - </div> diff --git a/view/de/profile_listing_header.tpl b/view/de/profile_listing_header.tpl deleted file mode 100644 index 3be77ba0d..000000000 --- a/view/de/profile_listing_header.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<h1>Profile</h1> -<p id="profile-listing-desc" > -<a href="profile_photo" >Profilbild ändern</a> -</p> -<div id="profile-listing-new-link-wrapper" > -<a href="profiles/new" id="profile-listing-new-link" name="Neues Profil anlegen" >Neues Profil anlegen</a> -</div> - diff --git a/view/en/profile-in-netdir.tpl b/view/en/profile-in-netdir.tpl deleted file mode 100644 index be111aa67..000000000 --- a/view/en/profile-in-netdir.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -Publish your default profile in global social directory? -</p> - - <div id="profile-in-netdir-yes-wrapper"> - <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" /> - - <div id="profile-in-netdir-break" ></div> - </div> - <div id="profile-in-netdir-no-wrapper"> - <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" /> - - <div id="profile-in-netdir-end"></div> - </div> diff --git a/view/en/profile_listing_header.tpl b/view/en/profile_listing_header.tpl deleted file mode 100644 index d4b139a69..000000000 --- a/view/en/profile_listing_header.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<h1>Profiles</h1> -<p id="profile-listing-desc" > -<a href="profile_photo" >Change profile photo</a> -</p> -<div id="profile-listing-new-link-wrapper" > -<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Create New Profile</a> -</div> - diff --git a/view/en/registrations.tpl b/view/en/registrations.tpl deleted file mode 100644 index c8646043e..000000000 --- a/view/en/registrations.tpl +++ /dev/null @@ -1 +0,0 @@ -<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li> diff --git a/view/fr/profile-hide-friends.tpl b/view/fr/profile-hide-friends.tpl deleted file mode 100644 index 857e049bb..000000000 --- a/view/fr/profile-hide-friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="hide-friends-text"> -Cacher ma liste de contacts/amis des visiteurs de ce profil? -</p> - - <div id="hide-friends-yes-wrapper"> - <label id="hide-friends-yes-label" for="hide-friends-yes">Oui</label> - <input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" /> - - <div id="hide-friends-break" ></div> - </div> - <div id="hide-friends-no-wrapper"> - <label id="hide-friends-no-label" for="hide-friends-no">Non</label> - <input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0" /> - - <div id="hide-friends-end"></div> - </div> diff --git a/view/fr/profile-in-directory.tpl b/view/fr/profile-in-directory.tpl deleted file mode 100644 index 1189e3f9f..000000000 --- a/view/fr/profile-in-directory.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -Publier votre profil par défaut dans l'annuaire local? -</p> - - <div id="profile-in-dir-yes-wrapper"> - <label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Oui</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" /> - - <div id="profile-in-dir-break" ></div> - </div> - <div id="profile-in-dir-no-wrapper"> - <label id="profile-in-dir-no-label" for="profile-in-dir-no">Non</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0" /> - - <div id="profile-in-dir-end"></div> - </div> diff --git a/view/fr/profile_listing_header.tpl b/view/fr/profile_listing_header.tpl deleted file mode 100644 index 70393e1bc..000000000 --- a/view/fr/profile_listing_header.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<h1>Profiles</h1> -<p id="profile-listing-desc" > -<a href="profile_photo" >Changer la photo du profil</a> -</p> -<div id="profile-listing-new-link-wrapper" > -<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Créer un nouveau profil</a> -</div> - diff --git a/view/fr/registrations.tpl b/view/fr/registrations.tpl deleted file mode 100644 index 73bc3883e..000000000 --- a/view/fr/registrations.tpl +++ /dev/null @@ -1 +0,0 @@ -<li>$fullname ($email) : <a href="$approvelink">Approuver</a> - <a href="$denylink">Refuser</a></li> diff --git a/view/it/profile-hide-friends.tpl b/view/it/profile-hide-friends.tpl deleted file mode 100644 index fb04d449b..000000000 --- a/view/it/profile-hide-friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="hide-friends-text"> -Nascondere la lista di contatti/amici dai visitatori di questo profilo? -</p> - - <div id="hide-friends-yes-wrapper"> - <label id="hide-friends-yes-label" for="hide-friends-yes">Si</label> - <input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" /> - - <div id="hide-friends-break" ></div> - </div> - <div id="hide-friends-no-wrapper"> - <label id="hide-friends-no-label" for="hide-friends-no">No</label> - <input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0" /> - - <div id="hide-friends-end"></div> - </div> diff --git a/view/it/profile-in-directory.tpl b/view/it/profile-in-directory.tpl deleted file mode 100644 index 69b025366..000000000 --- a/view/it/profile-in-directory.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -Pubblicare il tuo profilo di default nell'elenco sul sito? -</p> - - <div id="profile-in-dir-yes-wrapper"> - <label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Si</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" /> - - <div id="profile-in-dir-break" ></div> - </div> - <div id="profile-in-dir-no-wrapper"> - <label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0" /> - - <div id="profile-in-dir-end"></div> - </div> diff --git a/view/it/profile-in-netdir.tpl b/view/it/profile-in-netdir.tpl deleted file mode 100644 index ffe56edb6..000000000 --- a/view/it/profile-in-netdir.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -Pubblicare il tuo profilo di default nell'elenco sociale globale? -</p> - - <div id="profile-in-netdir-yes-wrapper"> - <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Si</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" /> - - <div id="profile-in-netdir-break" ></div> - </div> - <div id="profile-in-netdir-no-wrapper"> - <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" /> - - <div id="profile-in-netdir-end"></div> - </div> diff --git a/view/it/profile_listing_header.tpl b/view/it/profile_listing_header.tpl deleted file mode 100644 index 995a577b3..000000000 --- a/view/it/profile_listing_header.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<h1>Profiles</h1> -<p id="profile-listing-desc" > -<a href="profile_photo" >Cambia la foto del profilo</a> -</p> -<div id="profile-listing-new-link-wrapper" > -<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Crea un nuovo profilo</a> -</div> - diff --git a/view/it/registrations.tpl b/view/it/registrations.tpl deleted file mode 100644 index 698c766f7..000000000 --- a/view/it/registrations.tpl +++ /dev/null @@ -1 +0,0 @@ -<li>$fullname ($email) : <a href="$approvelink">Approva</a> - <a href="$denylink">Rifiuta</a></li> diff --git a/view/en/profile-hide-friends.tpl b/view/profile-hide-friends.tpl index 54ade00fe..9ecacfbe0 100644 --- a/view/en/profile-hide-friends.tpl +++ b/view/profile-hide-friends.tpl @@ -1,15 +1,15 @@ <p id="hide-friends-text"> -Hide my contact/friend list from viewers of this profile? +$desc </p> <div id="hide-friends-yes-wrapper"> - <label id="hide-friends-yes-label" for="hide-friends-yes">Yes</label> + <label id="hide-friends-yes-label" for="hide-friends-yes">$yes_str</label> <input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" /> <div id="hide-friends-break" ></div> </div> <div id="hide-friends-no-wrapper"> - <label id="hide-friends-no-label" for="hide-friends-no">No</label> + <label id="hide-friends-no-label" for="hide-friends-no">$no_str</label> <input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0" /> <div id="hide-friends-end"></div> diff --git a/view/en/profile-in-directory.tpl b/view/profile-in-directory.tpl index 98af3e59a..56b28d37e 100644 --- a/view/en/profile-in-directory.tpl +++ b/view/profile-in-directory.tpl @@ -1,15 +1,15 @@ <p id="profile-in-directory"> -Publish your default profile in site directory? +$desc </p> <div id="profile-in-dir-yes-wrapper"> - <label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Yes</label> + <label id="profile-in-dir-yes-label" for="profile-in-dir-yes">$yes_str</label> <input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" /> <div id="profile-in-dir-break" ></div> </div> <div id="profile-in-dir-no-wrapper"> - <label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label> + <label id="profile-in-dir-no-label" for="profile-in-dir-no">$no_str</label> <input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0" /> <div id="profile-in-dir-end"></div> diff --git a/view/fr/profile-in-netdir.tpl b/view/profile-in-netdir.tpl index 9b94f302a..882ad2d17 100644 --- a/view/fr/profile-in-netdir.tpl +++ b/view/profile-in-netdir.tpl @@ -1,15 +1,15 @@ <p id="profile-in-directory"> -Publier votre profil par défaut dans l'annuaire global? +$desc </p> <div id="profile-in-netdir-yes-wrapper"> - <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Oui</label> + <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">$yes_str</label> <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" /> <div id="profile-in-netdir-break" ></div> </div> <div id="profile-in-netdir-no-wrapper"> - <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">Non</label> + <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">$no_str</label> <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" /> <div id="profile-in-netdir-end"></div> diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl new file mode 100644 index 000000000..707dfec53 --- /dev/null +++ b/view/profile_listing_header.tpl @@ -0,0 +1,8 @@ +<h1>$header</h1> +<p id="profile-listing-desc" > +<a href="profile_photo" >$chg_photo</a> +</p> +<div id="profile-listing-new-link-wrapper" > +<a href="profiles/new" id="profile-listing-new-link" title="$cr_new" >$cr_new</a> +</div> + diff --git a/view/sv/profile-hide-friends.tpl b/view/sv/profile-hide-friends.tpl deleted file mode 100644 index 367c4317f..000000000 --- a/view/sv/profile-hide-friends.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="hide-friends-text"> -Dölj kontaktlista/vänlista för de som ser denna profil? -</p> - - <div id="hide-friends-yes-wrapper"> - <label id="hide-friends-yes-label" for="hide-friends-yes">Ja</label> - <input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" /> - - <div id="hide-friends-break" ></div> - </div> - <div id="hide-friends-no-wrapper"> - <label id="hide-friends-no-label" for="hide-friends-no">Nej</label> - <input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0" /> - - <div id="hide-friends-end"></div> - </div>
\ No newline at end of file diff --git a/view/sv/profile-in-directory.tpl b/view/sv/profile-in-directory.tpl deleted file mode 100644 index 982fe990e..000000000 --- a/view/sv/profile-in-directory.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -Publicera din huvudsakliga profil (default) i webbplatsens medlemskatalog? -</p> - - <div id="profile-in-dir-yes-wrapper"> - <label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Ja</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" /> - - <div id="profile-in-dir-break" ></div> - </div> - <div id="profile-in-dir-no-wrapper"> - <label id="profile-in-dir-no-label" for="profile-in-dir-no">Nej</label> - <input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0" /> - - <div id="profile-in-dir-end"></div> - </div>
\ No newline at end of file diff --git a/view/sv/profile-in-netdir.tpl b/view/sv/profile-in-netdir.tpl deleted file mode 100644 index 430173511..000000000 --- a/view/sv/profile-in-netdir.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<p id="profile-in-directory"> -Publicera din huvudsakliga profil (default) i den globala medlemskatalogen? -</p> - - <div id="profile-in-netdir-yes-wrapper"> - <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Ja</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" /> - - <div id="profile-in-netdir-break" ></div> - </div> - <div id="profile-in-netdir-no-wrapper"> - <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">Nej</label> - <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" /> - - <div id="profile-in-netdir-end"></div> - </div>
\ No newline at end of file diff --git a/view/sv/profile_listing_header.tpl b/view/sv/profile_listing_header.tpl deleted file mode 100644 index ce81dd279..000000000 --- a/view/sv/profile_listing_header.tpl +++ /dev/null @@ -1,7 +0,0 @@ -<h1>Profiler</h1> -<p id="profile-listing-desc" > -<a href="profile_photo" >Byt profilbild</a> -</p> -<div id="profile-listing-new-link-wrapper" > -<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Skapa ny profil</a> -</div> diff --git a/view/sv/registrations.tpl b/view/sv/registrations.tpl deleted file mode 100644 index 869fa1a90..000000000 --- a/view/sv/registrations.tpl +++ /dev/null @@ -1 +0,0 @@ -<li>$fullname ($email) : <a href="$approvelink">Godkänn</a> - <a href="$denylink">Avslå</a></li> |