diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/contacts.php | 8 | ||||
| -rw-r--r-- | mod/install.php | 10 | ||||
| -rw-r--r-- | mod/lostpass.php | 7 | ||||
| -rw-r--r-- | mod/profile.php | 11 | ||||
| -rw-r--r-- | mod/profile_photo.php | 6 | ||||
| -rw-r--r-- | mod/profiles.php | 38 | ||||
| -rw-r--r-- | mod/settings.php | 54 |
7 files changed, 107 insertions, 27 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 4d5311b69..834b1c63d 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -261,6 +261,14 @@ function contacts_content(&$a) { $o .= replace_macros($tpl,array( '$header' => t('Contact Editor'), + '$submit' => t('Submit'), + '$lbl_vis1' => t('Profile Visibility'), + '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $r[0]['name']), + '$lbl_info1' => t('Contact Information / Notes'), + '$lbl_rep1' => t('Online Reputation'), + '$lbl_rep2' => t('Occasionally your friends may wish to inquire about this person\'s online legitimacy.'), + '$lbl_rep3' => t('You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them.'), + '$lbl_rep4' => t('Please take a moment to elaborate on this selection if you feel it could be helpful to others.'), '$visit' => t('Visit $name\'s profile'), '$blockunblock' => t('Block/Unblock contact'), '$ignorecont' => t('Ignore contact'), diff --git a/mod/install.php b/mod/install.php index 5c508e4f2..740df6ca9 100644 --- a/mod/install.php +++ b/mod/install.php @@ -118,6 +118,16 @@ function install_content(&$a) { $tpl = load_view_file('view/install_db.tpl'); $o .= replace_macros($tpl, array( + '$lbl_01' => t('Friendika Social Network'), + '$lbl_02' => t('Installation'), + '$lbl_03' => t('In order to install Friendika we need to know how to contact your database.'), + '$lbl_04' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'), + '$lbl_05' => t('The database you specify below must already exist. If it does not, please create it before continuing.'), + '$lbl_06' => t('Database Server Name'), + '$lbl_07' => t('Database Login Name'), + '$lbl_08' => t('Database Login Password'), + '$lbl_09' => t('Database Name'), + '$lbl_10' => t('Please select a default timezone for your website'), '$baseurl' => $a->get_baseurl(), '$tzselect' => ((x($_POST,'timezone')) ? select_timezone($_POST['timezone']) : select_timezone()), '$submit' => t('Submit'), diff --git a/mod/lostpass.php b/mod/lostpass.php index 335a1f512..c46a57e6a 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -71,8 +71,15 @@ function lostpass_content(&$a) { if($r) { $tpl = load_view_file('view/pwdreset.tpl'); $o .= replace_macros($tpl,array( + '$lbl1' => t('Password Reset'), + '$lbl2' => t('Your password has been reset as requested.'), + '$lbl3' => t('Your new password is'), + '$lbl4' => t('Save or copy your new password - and then'), + '$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.', + '$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'), '$newpass' => $new_password, '$baseurl' => $a->get_baseurl() + )); notice("Your password has been reset." . EOL); diff --git a/mod/profile.php b/mod/profile.php index 3d0b79a70..88e23a8a4 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -106,16 +106,9 @@ function profile_content(&$a, $update = 0) { if($tab === 'profile') { - $profile_lang = get_config('system','language'); - if(! $profile_lang) - $profile_lang = 'en'; - if(file_exists("view/$profile_lang/profile_advanced.php")) - require_once("view/$profile_lang/profile_advanced.php"); - else - require_once('view/profile_advanced.php'); - + require_once('include/profile_advanced.php'); + $o .= advanced_profile($a); call_hooks('profile_advanced',$o); - return $o; } diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 48805fbdd..fe4da3baf 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -184,7 +184,11 @@ function profile_photo_content(&$a) { $tpl = load_view_file('view/profile_photo.tpl'); $o .= replace_macros($tpl,array( - '$user' => $a->user['nickname'] + '$user' => $a->user['nickname'], + '$lbl_upfile' => t('Upload File:'), + '$title' => t('Upload Profile Photo'), + '$submit' => t('Upload'), + '$select' => sprintf('%s %s', t('or'), '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>') )); return $o; diff --git a/mod/profiles.php b/mod/profiles.php index 99812ed88..4802f21aa 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -366,6 +366,44 @@ function profiles_content(&$a) { $is_default = (($r[0]['is-default']) ? 1 : 0); $tpl = load_view_file("view/profile_edit.tpl"); $o .= replace_macros($tpl,array( + '$banner' => t('Edit Profile Details'), + '$submit' => t('Submit'), + '$viewprof' => t('View this profile'), + '$cr_prof' => t('Create a new profile using these settings'), + '$cl_prof' => t('Clone this profile'), + '$del_prof' => t('Delete this profile'), + '$lbl_profname' => t('Profile Name:'), + '$lbl_fullname' => t('Your Full Name:'), + '$lbl_title' => t('Title/Description:'), + '$lbl_gender' => t('Your Gender:'), + '$lbl_bd' => t("Birthday \x28y/m/d\x29:"), + '$lbl_address' => t('Street Address:'), + '$lbl_city' => t('Locality/City:'), + '$lbl_zip' => t('Postal/Zip Code:'), + '$lbl_country' => t('Country:'), + '$lbl_region' => t('Region/State:'), + '$lbl_marital' => t('<span class="heart">♥</span> Marital Status:'), + '$lbl_with' => t("Who: \x28if applicable\x29"), + '$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'), + '$lbl_sexual' => t('Sexual Preference:'), + '$lbl_homepage' => t('Homepage URL:'), + '$lbl_politic' => t('Political Views:'), + '$lbl_religion' => t('Religious Views:'), + '$lbl_pubkey' => t('Public Keywords:'), + '$lbl_prvkey' => t('Private Keywords:'), + '$lbl_ex2' => t('Example: fishing photography software'), + '$lbl_pubdsc' => t("\x28Used for suggesting potential friends, can be seen by others\x29"), + '$lbl_prvdsc' => t("\x28Used for searching profiles, never shown to others\x29"), + '$lbl_about' => t('Tell us about yourself...'), + '$lbl_hobbies' => t('Hobbies/Interests'), + '$lbl_social' => t('Contact information and Social Networks'), + '$lbl_music' => t('Musical interests'), + '$lbl_book' => t('Books, literature'), + '$lbl_tv' => t('Television'), + '$lbl_film' => t('Film/dance/culture/entertainment'), + '$lbl_love' => t('Love/romance'), + '$lbl_work' => t('Work/employment'), + '$lbl_school' => t('School/education'), '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''), '$baseurl' => $a->get_baseurl(), '$profile_id' => $r[0]['id'], diff --git a/mod/settings.php b/mod/settings.php index 646ec55ea..5f88d95fb 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -315,18 +315,7 @@ function settings_content(&$a) { if($invisible) notice( t('Profile is <strong>not published</strong>.') . EOL ); - $nickname_block = load_view_file("view/settings_nick_set.tpl"); - $nickname_subdir = ''; - if(strlen($a->get_path())) { - $subdir_tpl = load_view_file('view/settings_nick_subdir.tpl'); - $nickname_subdir = replace_macros($subdir_tpl, array( - '$baseurl' => $a->get_baseurl(), - '$nickname' => $nickname, - '$hostname' => $a->get_hostname() - )); - } - $theme_selector = '<select name="theme" id="theme-select" >'; $files = glob('view/theme/*'); @@ -344,13 +333,16 @@ function settings_content(&$a) { } $theme_selector .= '</select>'; + $subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : ''); - $nickname_block = replace_macros($nickname_block,array( + $tpl_addr = load_view_file("view/settings_nick_set.tpl"); + + $prof_addr = replace_macros($tpl_addr,array( + '$desc' => t('Your profile address is'), '$nickname' => $nickname, - '$uid' => local_user(), - '$subdir' => $nickname_subdir, - '$basepath' => $a->get_hostname(), - '$baseurl' => $a->get_baseurl())); + '$subdir' => $subdir, + '$basepath' => $a->get_hostname() + )); $stpl = load_view_file('view/settings.tpl'); @@ -360,6 +352,34 @@ function settings_content(&$a) { $o .= replace_macros($stpl,array( + '$ptitle' => t('Account Settings'), + '$lbl_plug' => t('Plugin Settings'), + '$lbl_basic' => t('Basic Settings'), + '$lbl_fn' => t('Full Name:'), + '$lbl_email' => t('Email Address:'), + '$lbl_tz' => t('Your Timezone:'), + '$lbl_loc1' => t('Default Post Location:'), + '$lbl_loc2' => t('Use Browser Location:'), + '$lbl_theme' => t('Display Theme:'), + '$submit' => t('Submit'), + '$lbl_prv' => t('Security and Privacy Settings'), + '$lbl_maxreq' => t('Maximum Friend Requests/Day:'), + '$lbl_maxrdesc' => t("\x28to prevent spam abuse\x29"), + '$lbl_rempost' => t('Allow friends to post to your profile page:'), + '$lbl_exp1' => t("Automatically expire \x28delete\x29 posts older than"), + '$lbl_exp2' => t('days'), + '$lbl_not1' => t('Notification Settings'), + '$lbl_not2' => t('Send a notification email when:'), + '$lbl_not3' => t('You receive an introduction'), + '$lbl_not4' => t('Your introductions are confirmed'), + '$lbl_not5' => t('Someone writes on your profile wall'), + '$lbl_not6' => t('Someone writes a followup comment'), + '$lbl_not7' => t('You receive a private message'), + '$lbl_pass1' => t('Password Settings'), + '$lbl_pass2' => t('Leave password fields blank unless changing'), + '$lbl_pass3' => t('New Password:'), + '$lbl_pass4' => t('Confirm:'), + '$lbl_advn' => t('Advanced Page Settings'), '$baseurl' => $a->get_baseurl(), '$oidhtml' => $oidhtml, '$uexport' => $uexport, @@ -367,7 +387,7 @@ function settings_content(&$a) { '$username' => $username, '$openid' => $openid, '$email' => $email, - '$nickname_block' => $nickname_block, + '$nickname_block' => $prof_addr, '$timezone' => $timezone, '$zoneselect' => select_timezone($timezone), '$defloc' => $defloc, |