Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 04:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

track requested profile error msg

Browse source
This commit is contained in:
friendica 2012-04-14 14:45:09 -07:00
parent 6591b292a1
commit 0939029b74
3 changed files with 62 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1311' ); define ( 'FRIENDICA_VERSION', '2.3.1312' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 ); define ( 'DB_UPDATE_VERSION', 1138 );
@ -936,6 +936,7 @@ if(! function_exists('profile_load')) {
} }
if(($r === false) || (! count($r))) { if(($r === false) || (! count($r))) {
logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
notice( t('Requested profile is not available.') . EOL ); notice( t('Requested profile is not available.') . EOL );
$a->error = 404; $a->error = 404;
return; return;

1
mod/profile.php
View file

@ -17,6 +17,7 @@ function profile_init(&$a) {
goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']); goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
} }
else { else {
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
notice( t('Requested profile is not available.') . EOL ); notice( t('Requested profile is not available.') . EOL );
$a->error = 404; $a->error = 404;
return; return;

75
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1311\n" "Project-Id-Version: 2.3.1312\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-13 10:00-0700\n" "POT-Creation-Date: 2012-04-14 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -55,8 +55,8 @@ msgstr ""
#: ../../mod/profiles.php:7 ../../mod/profiles.php:329 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329
#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3132 #: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142
#: ../../index.php:305 #: ../../index.php:309
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -157,7 +157,12 @@ msgstr ""
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90 #: ../../addon/posterous/posterous.php:90
#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 #: ../../view/theme/diabook-red/config.php:64
#: ../../view/theme/diabook-blue/config.php:64
#: ../../view/theme/diabook/config.php:64
#: ../../view/theme/quattro/config.php:52
#: ../../view/theme/diabook-aerith/config.php:64
#: ../../include/conversation.php:555
msgid "Submit" msgid "Submit"
msgstr "" msgstr ""
@ -169,11 +174,11 @@ msgstr ""
msgid "Help" msgid "Help"
msgstr "" msgstr ""
#: ../../mod/help.php:38 ../../index.php:224 #: ../../mod/help.php:38 ../../index.php:228
msgid "Not Found" msgid "Not Found"
msgstr "" msgstr ""
#: ../../mod/help.php:41 ../../index.php:227 #: ../../mod/help.php:41 ../../index.php:231
msgid "Page not found." msgid "Page not found."
msgstr "" msgstr ""
@ -813,7 +818,7 @@ msgstr ""
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:628 ../../include/items.php:2652 #: ../../mod/dfrn_request.php:628 ../../include/items.php:2662
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "" msgstr ""
@ -1642,7 +1647,7 @@ msgstr ""
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
#: ../../addon/facebook/facebook.php:622 #: ../../addon/facebook/facebook.php:622
#: ../../addon/facebook/facebook.php:1076 #: ../../addon/facebook/facebook.php:1076
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2661 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2671
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -2476,7 +2481,7 @@ msgstr ""
msgid "Group name changed." msgid "Group name changed."
msgstr "" msgstr ""
#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:304 #: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
msgid "Permission denied" msgid "Permission denied"
msgstr "" msgstr ""
@ -2736,7 +2741,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37 #: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
#: ../../mod/display.php:142 ../../include/items.php:3044 #: ../../mod/display.php:142 ../../include/items.php:3054
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -5476,10 +5481,28 @@ msgstr ""
msgid "Your personal photos" msgid "Your personal photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/config.php:66
#: ../../view/theme/diabook-blue/config.php:66
#: ../../view/theme/diabook/config.php:66
#: ../../view/theme/quattro/config.php:54 #: ../../view/theme/quattro/config.php:54
#: ../../view/theme/diabook-aerith/config.php:66
msgid "Theme settings" msgid "Theme settings"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/config.php:67
#: ../../view/theme/diabook-blue/config.php:67
#: ../../view/theme/diabook/config.php:67
#: ../../view/theme/diabook-aerith/config.php:67
msgid "Set font-size for posts and comments"
msgstr ""
#: ../../view/theme/diabook-red/config.php:68
#: ../../view/theme/diabook-blue/config.php:68
#: ../../view/theme/diabook/config.php:68
#: ../../view/theme/diabook-aerith/config.php:68
msgid "Set line-height for posts and comments"
msgstr ""
#: ../../view/theme/quattro/config.php:55 #: ../../view/theme/quattro/config.php:55
msgid "Alignment" msgid "Alignment"
msgstr "" msgstr ""
@ -5509,7 +5532,7 @@ msgid "j F"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
#: ../../include/items.php:1392 #: ../../include/items.php:1402
msgid "Birthday:" msgid "Birthday:"
msgstr "" msgstr ""
@ -5769,6 +5792,14 @@ msgstr ""
msgid "Unavailable" msgid "Unavailable"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Has crush"
msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Infatuated"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Dating" msgid "Dating"
msgstr "" msgstr ""
@ -5801,6 +5832,10 @@ msgstr ""
msgid "Married" msgid "Married"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Imaginarily married"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Partners" msgid "Partners"
msgstr "" msgstr ""
@ -5809,12 +5844,16 @@ msgstr ""
msgid "Cohabiting" msgid "Cohabiting"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Common law"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Happy" msgid "Happy"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Not Looking" msgid "Not looking"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
@ -5837,6 +5876,10 @@ msgstr ""
msgid "Divorced" msgid "Divorced"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Imaginarily divorced"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Widowed" msgid "Widowed"
msgstr "" msgstr ""
@ -5846,7 +5889,7 @@ msgid "Uncertain"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Complicated" msgid "It's complicated"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
@ -6564,11 +6607,11 @@ msgstr ""
msgid "Please visit %s to approve or reject the suggestion." msgid "Please visit %s to approve or reject the suggestion."
msgstr "" msgstr ""
#: ../../include/items.php:2659 #: ../../include/items.php:2669
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "" msgstr ""
#: ../../include/items.php:2659 #: ../../include/items.php:2669
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "" msgstr ""