From 78e03abed8e72e29d2463e9de8e279dc86e5d39e Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 29 Jun 2012 20:11:36 -0700 Subject: [PATCH] convert ent_quotes for jquery calendar title/summary --- boot.php | 2 +- mod/events.php | 4 +- util/messages.po | 138 +++++++++++++++++++++++------------------------ 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/boot.php b/boot.php index 973e3578a6..aa016ef0c7 100644 --- a/boot.php +++ b/boot.php @@ -10,7 +10,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1388' ); +define ( 'FRIENDICA_VERSION', '3.0.1389' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1151 ); diff --git a/mod/events.php b/mod/events.php index 7940e79a42..bf02f83099 100755 --- a/mod/events.php +++ b/mod/events.php @@ -280,10 +280,10 @@ function events_content(&$a) { $last_date = $d; $edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null); - $title = strip_tags(bbcode($rr['summary'])); + $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); if(! $title) { list($title, $_trash) = explode("\n" "Language-Team: LANGUAGE \n" @@ -56,7 +56,7 @@ msgstr "" #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:508 #: ../../addon/facebook/facebook.php:514 ../../addon/dav/layout.fnk.php:353 -#: ../../include/items.php:3447 ../../index.php:309 +#: ../../include/items.php:3455 ../../index.php:309 msgid "Permission denied." msgstr "" @@ -228,7 +228,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1549 +#: ../../include/nav.php:52 ../../boot.php:1551 msgid "Events" msgstr "" @@ -283,7 +283,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:429 ../../include/event.php:40 -#: ../../include/bb2diaspora.php:357 ../../boot.php:1126 +#: ../../include/bb2diaspora.php:357 ../../boot.php:1128 msgid "Location:" msgstr "" @@ -364,7 +364,7 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1543 +#: ../../mod/photos.php:46 ../../boot.php:1545 msgid "Photo Albums" msgstr "" @@ -417,7 +417,7 @@ msgstr "" #: ../../mod/photos.php:591 ../../mod/like.php:144 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 +#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1317 #: ../../include/diaspora.php:1710 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -583,7 +583,7 @@ msgstr "" #: ../../mod/photos.php:1342 ../../mod/photos.php:1382 #: ../../mod/photos.php:1413 ../../include/conversation.php:579 -#: ../../boot.php:518 +#: ../../boot.php:520 msgid "Comment" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:2873 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:2881 msgid "[Name Withheld]" msgstr "" @@ -1217,7 +1217,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1070 +#: ../../include/contact_widgets.php:9 ../../boot.php:1072 msgid "Connect" msgstr "" @@ -1747,8 +1747,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:700 #: ../../addon/facebook/facebook.php:1190 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2882 -#: ../../boot.php:720 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2890 +#: ../../boot.php:722 msgid "Administrator" msgstr "" @@ -1758,7 +1758,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:852 +#: ../../mod/lostpass.php:83 ../../boot.php:854 msgid "Password Reset" msgstr "" @@ -2433,7 +2433,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1555 +#: ../../mod/notes.php:44 ../../boot.php:1557 msgid "Personal Notes" msgstr "" @@ -2684,7 +2684,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:1534 +#: ../../include/nav.php:50 ../../boot.php:1536 msgid "Profile" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:818 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:820 msgid "Register" msgstr "" @@ -2822,7 +2822,7 @@ msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3326 +#: ../../mod/display.php:142 ../../include/items.php:3334 msgid "Item not found." msgstr "" @@ -2831,7 +2831,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1540 +#: ../../include/nav.php:51 ../../boot.php:1542 msgid "Photos" msgstr "" @@ -3634,7 +3634,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:983 +#: ../../mod/profile.php:21 ../../boot.php:985 msgid "Requested profile is not available." msgstr "" @@ -4025,23 +4025,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:664 ../../boot.php:1092 +#: ../../mod/profiles.php:664 ../../boot.php:1094 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:665 ../../boot.php:1093 +#: ../../mod/profiles.php:665 ../../boot.php:1095 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:676 ../../boot.php:1103 +#: ../../mod/profiles.php:676 ../../boot.php:1105 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:678 ../../boot.php:1106 +#: ../../mod/profiles.php:678 ../../boot.php:1108 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:679 ../../boot.php:1107 +#: ../../mod/profiles.php:679 ../../boot.php:1109 msgid "Edit visibility" msgstr "" @@ -4677,7 +4677,7 @@ msgstr "" #: ../../addon/page/page.php:73 ../../addon/page/page.php:107 #: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188 -#: ../../include/conversation.php:476 ../../boot.php:519 +#: ../../include/conversation.php:476 ../../boot.php:521 msgid "show more" msgstr "" @@ -4709,7 +4709,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:839 +#: ../../include/nav.php:64 ../../boot.php:841 msgid "Login" msgstr "" @@ -4737,7 +4737,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1314 +#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1315 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -6123,7 +6123,7 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1128 +#: ../../include/profile_advanced.php:17 ../../boot.php:1130 msgid "Gender:" msgstr "" @@ -6143,7 +6143,7 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1131 +#: ../../include/profile_advanced.php:37 ../../boot.php:1133 msgid "Status:" msgstr "" @@ -6152,7 +6152,7 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: ../../include/profile_advanced.php:48 ../../boot.php:1133 +#: ../../include/profile_advanced.php:48 ../../boot.php:1135 msgid "Homepage:" msgstr "" @@ -6656,27 +6656,27 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1096 ../../include/user.php:236 +#: ../../include/text.php:1097 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1108 +#: ../../include/text.php:1109 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1318 +#: ../../include/text.php:1319 msgid "activity" msgstr "" -#: ../../include/text.php:1320 +#: ../../include/text.php:1321 msgid "comment" msgstr "" -#: ../../include/text.php:1321 +#: ../../include/text.php:1322 msgid "post" msgstr "" -#: ../../include/text.php:1476 +#: ../../include/text.php:1477 msgid "Item filed" msgstr "" @@ -6735,7 +6735,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:838 +#: ../../include/nav.php:46 ../../boot.php:840 msgid "Logout" msgstr "" @@ -6743,7 +6743,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1528 +#: ../../include/nav.php:49 ../../boot.php:1530 msgid "Status" msgstr "" @@ -6823,11 +6823,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1086 +#: ../../include/nav.php:138 ../../boot.php:1088 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1086 +#: ../../include/nav.php:138 ../../boot.php:1088 msgid "Manage/edit profiles" msgstr "" @@ -7248,15 +7248,15 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:2880 +#: ../../include/items.php:2888 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2880 +#: ../../include/items.php:2888 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:3512 +#: ../../include/items.php:3520 msgid "Archives" msgstr "" @@ -7611,96 +7611,96 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:517 +#: ../../boot.php:519 msgid "Delete this item?" msgstr "" -#: ../../boot.php:520 +#: ../../boot.php:522 msgid "show fewer" msgstr "" -#: ../../boot.php:715 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" - #: ../../boot.php:717 #, php-format +msgid "Update %s failed. See error logs." +msgstr "" + +#: ../../boot.php:719 +#, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:817 +#: ../../boot.php:819 msgid "Create a New Account" msgstr "" -#: ../../boot.php:841 +#: ../../boot.php:843 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:842 +#: ../../boot.php:844 msgid "Password: " msgstr "" -#: ../../boot.php:845 +#: ../../boot.php:847 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:851 +#: ../../boot.php:853 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1018 +#: ../../boot.php:1020 msgid "Edit profile" msgstr "" -#: ../../boot.php:1078 +#: ../../boot.php:1080 msgid "Message" msgstr "" -#: ../../boot.php:1194 ../../boot.php:1273 +#: ../../boot.php:1196 ../../boot.php:1275 msgid "g A l F d" msgstr "" -#: ../../boot.php:1195 ../../boot.php:1274 +#: ../../boot.php:1197 ../../boot.php:1276 msgid "F d" msgstr "" -#: ../../boot.php:1240 ../../boot.php:1314 +#: ../../boot.php:1242 ../../boot.php:1316 msgid "[today]" msgstr "" -#: ../../boot.php:1252 +#: ../../boot.php:1254 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1253 +#: ../../boot.php:1255 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1307 +#: ../../boot.php:1309 msgid "[No description]" msgstr "" -#: ../../boot.php:1325 +#: ../../boot.php:1327 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1326 +#: ../../boot.php:1328 msgid "Events this week:" msgstr "" -#: ../../boot.php:1531 +#: ../../boot.php:1533 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1537 +#: ../../boot.php:1539 msgid "Profile Details" msgstr "" -#: ../../boot.php:1552 +#: ../../boot.php:1554 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1558 +#: ../../boot.php:1560 msgid "Only You Can See This" msgstr ""