diff options
| -rw-r--r-- | boot.php | 6 | ||||
| -rw-r--r-- | include/dba.php | 2 | ||||
| -rw-r--r-- | util/strings.php | 52 |
3 files changed, 30 insertions, 30 deletions
@@ -1862,11 +1862,11 @@ function format_like($cnt,$arr,$type,$id) { if(! function_exists('load_view_file')) { function load_view_file($s) { + global $lang; + if(! isset($lang)) + $lang = 'en'; $b = basename($s); $d = dirname($s); - $lang = get_config('system','language'); - if($lang === false) - $lang = 'en'; if(file_exists("$d/$lang/$b")) return file_get_contents("$d/$lang/$b"); return file_get_contents($s); diff --git a/include/dba.php b/include/dba.php index e2f369f19..49b325cf7 100644 --- a/include/dba.php +++ b/include/dba.php @@ -28,7 +28,7 @@ class dba { if($install) { if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { - notice( sprintf( t('Cannot locate DNS info for database server \'%s\'',$server))); + notice( sprintf( t('Cannot locate DNS info for database server \'%s\''), $server)); $this->connected = false; $this->db = null; return; diff --git a/util/strings.php b/util/strings.php index 042a33569..31dffd162 100644 --- a/util/strings.php +++ b/util/strings.php @@ -65,30 +65,6 @@ $a->strings['Birthdays this week:'] = 'Birthdays this week:'; $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29"; $a->strings['[today]'] = '[today]'; $a->strings['link to source'] = 'link to source'; -$a->strings['No recipient selected.'] = 'No recipient selected.'; -$a->strings['[no subject]'] = '[no subject]'; -$a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.'; -$a->strings['Wall Photos'] = 'Wall Photos'; -$a->strings['Message sent.'] = 'Message sent.'; -$a->strings['Message could not be sent.'] = 'Message could not be sent.'; -$a->strings['Messages'] = 'Messages'; -$a->strings['Inbox'] = 'Inbox'; -$a->strings['Outbox'] = 'Outbox'; -$a->strings['New Message'] = 'New Message'; -$a->strings['Message deleted.'] = 'Message deleted.'; -$a->strings['Conversation removed.'] = 'Conversation removed.'; -$a->strings['Send Private Message'] = 'Send Private Message'; -$a->strings['To:'] = 'To:'; -$a->strings['Subject:'] = 'Subject:'; -$a->strings['Your message:'] = 'Your message:'; -$a->strings['Upload photo'] = 'Upload photo'; -$a->strings['Insert web link'] = 'Insert web link'; -$a->strings['Please wait'] = 'Please wait'; -$a->strings['No messages.'] = 'No messages.'; -$a->strings['Delete conversation'] = 'Delete conversation'; -$a->strings['Message not available.'] = 'Message not available.'; -$a->strings['Delete message'] = 'Delete message'; -$a->strings['Send Reply'] = 'Send Reply'; $a->strings['Applications'] = 'Applications'; $a->strings["Invite Friends"] = "Invite Friends"; $a->strings['Connect/Follow'] = 'Connect/Follow'; @@ -200,6 +176,7 @@ $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['Share'] = 'Share'; +$a->strings['Please wait'] = 'Please wait'; $a->strings['This is you'] = 'This is you'; $a->strings['Edit'] = 'Edit'; $a->strings['Delete'] = 'Delete'; @@ -212,6 +189,8 @@ $a->strings['Item has been removed.'] = 'Item has been removed.'; $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'; $a->strings['Item not found'] = 'Item not found'; $a->strings['Edit post'] = 'Edit post'; +$a->strings['Upload photo'] = 'Upload photo'; +$a->strings['Insert web link'] = 'Insert web link'; $a->strings['Insert YouTube video'] = 'Insert YouTube video'; $a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video'; $a->strings['Insert Vorbis [.ogg] audio'] = 'Insert Vorbis [.ogg] audio'; @@ -262,6 +241,7 @@ $a->strings['%s : Not a valid email address.'] = '%s : Not a valid email address $a->strings['%s : Message delivery failed.'] = '%s : Message delivery failed.'; $a->strings['Send invitations'] = 'Send invitations'; $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:'; +$a->strings['Your message:'] = 'Your message:'; $a->strings['To accept this invitation, please visit:'] = 'To accept this invitation, please visit:'; $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:'; $a->strings["%d message sent."] = array( @@ -270,6 +250,7 @@ $a->strings["%d message sent."] = array( ); $a->strings['Unable to locate original post.'] = 'Unable to locate original post.'; $a->strings['Empty post discarded.'] = 'Empty post discarded.'; +$a->strings['Wall Photos'] = 'Wall Photos'; $a->strings["%s commented on your item at %s"] = "%s commented on your item at %s"; $a->strings["Administrator"] = "Administrator"; $a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s"; @@ -287,9 +268,28 @@ $a->strings["Welcome back %s"] = "Welcome back %s"; $a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages'; $a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29"; $a->strings['Select an identity to manage: '] = 'Select an identity to manage: '; +$a->strings['No recipient selected.'] = 'No recipient selected.'; +$a->strings['[no subject]'] = '[no subject]'; +$a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.'; +$a->strings['Message sent.'] = 'Message sent.'; +$a->strings['Message could not be sent.'] = 'Message could not be sent.'; +$a->strings['Messages'] = 'Messages'; +$a->strings['Inbox'] = 'Inbox'; +$a->strings['Outbox'] = 'Outbox'; +$a->strings['New Message'] = 'New Message'; +$a->strings['Message deleted.'] = 'Message deleted.'; +$a->strings['Conversation removed.'] = 'Conversation removed.'; +$a->strings['Please enter a link URL:'] = 'Please enter a link URL:'; +$a->strings['Send Private Message'] = 'Send Private Message'; +$a->strings['To:'] = 'To:'; +$a->strings['Subject:'] = 'Subject:'; +$a->strings['No messages.'] = 'No messages.'; +$a->strings['Delete conversation'] = 'Delete conversation'; +$a->strings['Message not available.'] = 'Message not available.'; +$a->strings['Delete message'] = 'Delete message'; +$a->strings['Send Reply'] = 'Send Reply'; $a->strings['Normal View'] = 'Normal View'; $a->strings['New Item View'] = 'New Item View'; -$a->strings['Please enter a link URL:'] = 'Please enter a link URL:'; $a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:'; $a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:"; $a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:"; @@ -449,7 +449,7 @@ $a->strings['minutes'] = 'minutes'; $a->strings['second'] = 'second'; $a->strings['seconds'] = 'seconds'; $a->strings[' ago'] = ' ago'; -$a->strings['Cannot locate DNS info for database server \'%s\'',$server] = 'Cannot locate DNS info for database server \'%s\'',$server; +$a->strings['Cannot locate DNS info for database server \'%s\''] = 'Cannot locate DNS info for database server \'%s\''; $a->strings['Create a new group'] = 'Create a new group'; $a->strings['Everybody'] = 'Everybody'; $a->strings['Birthday:'] = 'Birthday:'; |