diff --git a/boot.php b/boot.php index 5fe0d7dd26..a2e9fda36b 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1439' ); +define ( 'FRIENDICA_VERSION', '3.0.1440' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1154 ); diff --git a/include/conversation.php b/include/conversation.php index 05adb9a121..ee8e73cebe 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -583,6 +583,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr 'osparkle' => $osparkle, 'sparkle' => $sparkle, 'title' => template_escape($item['title']), + 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), + 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), 'lock' => $lock, 'location' => template_escape($location), @@ -815,6 +817,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'title' => template_escape($item['title']), 'body' => template_escape($body), 'text' => strip_tags(template_escape($body)), + 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), 'location' => template_escape($location), 'indent' => '', diff --git a/mod/profiles.php b/mod/profiles.php index 975a8c2127..74844ff42e 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -48,10 +48,15 @@ function profiles_post(&$a) { $name = notags(trim($_POST['name'])); + if(! strlen($name)) { + $name = '[No Name]'; + } + if($orig[0]['name'] != $name) $namechanged = true; + $pdesc = notags(trim($_POST['pdesc'])); $gender = notags(trim($_POST['gender'])); $address = notags(trim($_POST['address'])); diff --git a/util/messages.po b/util/messages.po index 82b79605b0..498f6fd831 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1439\n" +"Project-Id-Version: 3.0.1440\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-18 10:00-0700\n" +"POT-Creation-Date: 2012-08-19 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,7 +52,7 @@ msgstr "" #: ../../mod/message.php:168 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/follow.php:9 ../../mod/display.php:131 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:408 ../../mod/delegate.php:6 +#: ../../mod/profiles.php:413 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 @@ -134,7 +134,7 @@ msgstr "" #: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/message.php:294 #: ../../mod/message.php:478 ../../mod/admin.php:435 ../../mod/admin.php:676 #: ../../mod/admin.php:812 ../../mod/admin.php:1011 ../../mod/admin.php:1098 -#: ../../mod/profiles.php:578 ../../mod/invite.php:119 +#: ../../mod/profiles.php:583 ../../mod/invite.php:119 #: ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90 @@ -233,7 +233,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1651 +#: ../../include/nav.php:52 ../../boot.php:1655 msgid "Events" msgstr "" @@ -289,7 +289,7 @@ msgstr "" #: ../../mod/events.php:432 ../../mod/directory.php:132 #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../boot.php:1203 +#: ../../boot.php:1207 msgid "Location:" msgstr "" @@ -355,7 +355,7 @@ msgstr "" #: ../../mod/settings.php:945 ../../mod/settings.php:946 #: ../../mod/settings.php:947 ../../mod/settings.php:948 #: ../../mod/settings.php:949 ../../mod/register.php:234 -#: ../../mod/profiles.php:558 +#: ../../mod/profiles.php:563 msgid "Yes" msgstr "" @@ -367,11 +367,11 @@ msgstr "" #: ../../mod/settings.php:945 ../../mod/settings.php:946 #: ../../mod/settings.php:947 ../../mod/settings.php:948 #: ../../mod/settings.php:949 ../../mod/register.php:235 -#: ../../mod/profiles.php:559 +#: ../../mod/profiles.php:564 msgid "No" msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1644 +#: ../../mod/photos.php:46 ../../boot.php:1648 msgid "Photo Albums" msgstr "" @@ -1252,7 +1252,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1147 +#: ../../include/contact_widgets.php:9 ../../boot.php:1151 msgid "Connect" msgstr "" @@ -1925,7 +1925,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:929 +#: ../../mod/lostpass.php:83 ../../boot.php:933 msgid "Password Reset" msgstr "" @@ -2593,7 +2593,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1658 +#: ../../mod/notes.php:44 ../../boot.php:1662 msgid "Personal Notes" msgstr "" @@ -2846,7 +2846,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 -#: ../../include/nav.php:50 ../../boot.php:1634 +#: ../../include/nav.php:50 ../../boot.php:1638 msgid "Profile" msgstr "" @@ -2993,7 +2993,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1641 +#: ../../include/nav.php:51 ../../boot.php:1645 msgid "Photos" msgstr "" @@ -3825,7 +3825,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:22 ../../boot.php:1060 +#: ../../mod/profile.php:22 ../../boot.php:1064 msgid "Requested profile is not available." msgstr "" @@ -3933,8 +3933,8 @@ msgstr "" msgid "Search" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:418 -#: ../../mod/profiles.php:532 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:423 +#: ../../mod/profiles.php:537 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -3942,301 +3942,301 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:155 +#: ../../mod/profiles.php:160 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:159 +#: ../../mod/profiles.php:164 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:163 +#: ../../mod/profiles.php:168 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:167 +#: ../../mod/profiles.php:172 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:171 +#: ../../mod/profiles.php:176 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:174 +#: ../../mod/profiles.php:179 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:178 +#: ../../mod/profiles.php:183 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:182 +#: ../../mod/profiles.php:187 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:186 +#: ../../mod/profiles.php:191 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:190 +#: ../../mod/profiles.php:195 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:194 +#: ../../mod/profiles.php:199 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:198 +#: ../../mod/profiles.php:203 msgid "Address" msgstr "" -#: ../../mod/profiles.php:205 ../../addon/dav/common/wdcal_edit.inc.php:183 +#: ../../mod/profiles.php:210 ../../addon/dav/common/wdcal_edit.inc.php:183 msgid "Location" msgstr "" -#: ../../mod/profiles.php:288 +#: ../../mod/profiles.php:293 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:355 +#: ../../mod/profiles.php:360 msgid " and " msgstr "" -#: ../../mod/profiles.php:363 +#: ../../mod/profiles.php:368 msgid "public profile" msgstr "" -#: ../../mod/profiles.php:366 +#: ../../mod/profiles.php:371 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../mod/profiles.php:367 +#: ../../mod/profiles.php:372 #, php-format msgid " - Visit %1$s's %2$s" msgstr "" -#: ../../mod/profiles.php:370 +#: ../../mod/profiles.php:375 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../mod/profiles.php:437 +#: ../../mod/profiles.php:442 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:455 ../../mod/profiles.php:489 +#: ../../mod/profiles.php:460 ../../mod/profiles.php:494 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:474 ../../mod/profiles.php:516 +#: ../../mod/profiles.php:479 ../../mod/profiles.php:521 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:495 +#: ../../mod/profiles.php:500 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:557 +#: ../../mod/profiles.php:562 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:577 +#: ../../mod/profiles.php:582 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:579 +#: ../../mod/profiles.php:584 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:580 +#: ../../mod/profiles.php:585 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:581 +#: ../../mod/profiles.php:586 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:582 +#: ../../mod/profiles.php:587 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:583 +#: ../../mod/profiles.php:588 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:584 +#: ../../mod/profiles.php:589 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:585 +#: ../../mod/profiles.php:590 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:586 +#: ../../mod/profiles.php:591 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:587 +#: ../../mod/profiles.php:592 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:588 +#: ../../mod/profiles.php:593 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:589 +#: ../../mod/profiles.php:594 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:590 +#: ../../mod/profiles.php:595 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:591 +#: ../../mod/profiles.php:596 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:592 +#: ../../mod/profiles.php:597 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:598 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:594 +#: ../../mod/profiles.php:599 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:600 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:596 +#: ../../mod/profiles.php:601 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:597 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:602 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:603 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:599 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "" -#: ../../mod/profiles.php:600 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:606 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:607 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:608 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:609 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "" -#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:610 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:611 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:612 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:613 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:614 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:615 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:616 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:617 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:613 +#: ../../mod/profiles.php:618 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:619 msgid "Television" msgstr "" -#: ../../mod/profiles.php:615 +#: ../../mod/profiles.php:620 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:616 +#: ../../mod/profiles.php:621 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:622 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:623 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:628 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:633 ../../mod/directory.php:109 +#: ../../mod/profiles.php:638 ../../mod/directory.php:109 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:672 +#: ../../mod/profiles.php:677 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:673 ../../boot.php:1169 +#: ../../mod/profiles.php:678 ../../boot.php:1173 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:674 ../../boot.php:1170 +#: ../../mod/profiles.php:679 ../../boot.php:1174 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:685 ../../boot.php:1180 +#: ../../mod/profiles.php:690 ../../boot.php:1184 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:687 ../../boot.php:1183 +#: ../../mod/profiles.php:692 ../../boot.php:1187 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:688 ../../boot.php:1184 +#: ../../mod/profiles.php:693 ../../boot.php:1188 msgid "Edit visibility" msgstr "" @@ -4365,17 +4365,17 @@ msgid "Gender: " msgstr "" #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 -#: ../../boot.php:1205 +#: ../../boot.php:1209 msgid "Gender:" msgstr "" #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 -#: ../../boot.php:1208 +#: ../../boot.php:1212 msgid "Status:" msgstr "" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 -#: ../../boot.php:1210 +#: ../../boot.php:1214 msgid "Homepage:" msgstr "" @@ -5134,7 +5134,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:916 +#: ../../include/nav.php:64 ../../boot.php:920 msgid "Login" msgstr "" @@ -7587,7 +7587,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:915 +#: ../../include/nav.php:46 ../../boot.php:919 msgid "Logout" msgstr "" @@ -7595,7 +7595,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1627 +#: ../../include/nav.php:49 ../../boot.php:1631 msgid "Status" msgstr "" @@ -7675,11 +7675,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1163 +#: ../../include/nav.php:138 ../../boot.php:1167 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1163 +#: ../../include/nav.php:138 ../../boot.php:1167 msgid "Manage/edit profiles" msgstr "" @@ -7847,7 +7847,7 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:327 +#: ../../include/bbcode.php:327 ../../include/bbcode.php:328 msgid "Encrypted content" msgstr "" @@ -8388,74 +8388,74 @@ msgstr "" msgid "Create a New Account" msgstr "" -#: ../../boot.php:918 +#: ../../boot.php:922 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:919 +#: ../../boot.php:923 msgid "Password: " msgstr "" -#: ../../boot.php:922 +#: ../../boot.php:926 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:928 +#: ../../boot.php:932 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1095 +#: ../../boot.php:1099 msgid "Edit profile" msgstr "" -#: ../../boot.php:1155 +#: ../../boot.php:1159 msgid "Message" msgstr "" -#: ../../boot.php:1277 ../../boot.php:1363 +#: ../../boot.php:1281 ../../boot.php:1367 msgid "g A l F d" msgstr "" -#: ../../boot.php:1278 ../../boot.php:1364 +#: ../../boot.php:1282 ../../boot.php:1368 msgid "F d" msgstr "" -#: ../../boot.php:1323 ../../boot.php:1404 +#: ../../boot.php:1327 ../../boot.php:1408 msgid "[today]" msgstr "" -#: ../../boot.php:1335 +#: ../../boot.php:1339 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1336 +#: ../../boot.php:1340 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1397 +#: ../../boot.php:1401 msgid "[No description]" msgstr "" -#: ../../boot.php:1415 +#: ../../boot.php:1419 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1416 +#: ../../boot.php:1420 msgid "Events this week:" msgstr "" -#: ../../boot.php:1630 +#: ../../boot.php:1634 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1637 +#: ../../boot.php:1641 msgid "Profile Details" msgstr "" -#: ../../boot.php:1654 +#: ../../boot.php:1658 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1661 +#: ../../boot.php:1665 msgid "Only You Can See This" msgstr "" diff --git a/view/search_item.tpl b/view/search_item.tpl index f67bf0a254..8d8a0dbd4d 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -23,7 +23,7 @@
$item.name -
$item.ago
+
$item.ago
diff --git a/view/wall_item.tpl b/view/wall_item.tpl index e278294315..e4eabb9e5c 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -24,7 +24,7 @@
$item.name -
$item.ago
+
$item.ago
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl index db7321466e..f64f2e44a0 100644 --- a/view/wall_thread.tpl +++ b/view/wall_thread.tpl @@ -31,7 +31,7 @@
$item.name -
$item.ago
+
$item.ago
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index d7df45cfae..e8044532a3 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -29,7 +29,7 @@
$item.name $item.to $item.owner_name $item.vwall
-
$item.ago
+
$item.ago
$item.title
diff --git a/view/wallwall_thread.tpl b/view/wallwall_thread.tpl index 15c016c16c..68bb3bc9d5 100644 --- a/view/wallwall_thread.tpl +++ b/view/wallwall_thread.tpl @@ -36,7 +36,7 @@
$item.name $item.to $item.owner_name $item.vwall
-
$item.ago
+
$item.ago
$item.title