Update translator documentation.

Whitespace updates.
L10n/i18n updates.
This commit is contained in:
Siebrand Mazeland 2011-04-07 22:25:16 +02:00
parent 2640232c68
commit a9eaaf6341
4 changed files with 69 additions and 20 deletions

View File

@ -29,7 +29,6 @@ if (!defined('STATUSNET')) {
*/
class ExtendedProfilePlugin extends Plugin
{
function onPluginVersion(&$versions)
{
$versions[] = array(
@ -37,8 +36,8 @@ class ExtendedProfilePlugin extends Plugin
'version' => STATUSNET_VERSION,
'author' => 'Brion Vibber, Samantha Doherty, Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
'rawdescription' => _m(
'UI extensions for additional profile fields.')
// TRANS: Plugin description.
'rawdescription' => _m('UI extensions for additional profile fields.')
);
return true;
@ -120,9 +119,9 @@ class ExtendedProfilePlugin extends Plugin
$user = User::staticGet('id', $profile->id);
if ($user) {
$url = common_local_url('profiledetail', array('nickname' => $user->nickname));
// TRANS: Link text on user profile page leading to extended profile page.
$out->element('a', array('href' => $url, 'class' => 'profiledetail'), _m('More details...'));
}
return true;
}
}

View File

@ -80,7 +80,6 @@ class Profile_detail extends Managed_DataObject
* @return User_greeting_count object found, or null for no hits
*
*/
function staticGet($k, $v=null)
{
return Memcached_DataObject::staticGet('Profile_detail', $k, $v);
@ -98,7 +97,6 @@ class Profile_detail extends Managed_DataObject
* @return Bookmark object found, or null for no hits
*
*/
function pkeyGet($kv)
{
return Memcached_DataObject::pkeyGet('Profile_detail', $kv);
@ -107,6 +105,7 @@ class Profile_detail extends Managed_DataObject
static function schemaDef()
{
return array(
// No need for i18n. Table properties.
'description'
=> 'Additional profile details for the ExtendedProfile plugin',
'fields' => array(
@ -138,5 +137,4 @@ class Profile_detail extends Managed_DataObject
)
);
}
}

View File

@ -116,6 +116,7 @@ class ExtendedProfile
if (empty($phones)) {
$pArrays[] = array(
// TRANS: Field label for extended profile properties.
'label' => _m('Phone'),
'index' => 0,
'type' => 'phone',
@ -126,6 +127,7 @@ class ExtendedProfile
} else {
for ($i = 0; $i < sizeof($phones); $i++) {
$pa = array(
// TRANS: Field label for extended profile properties.
'label' => _m('Phone'),
'type' => 'phone',
'index' => intval($phones[$i]->value_index),
@ -147,12 +149,14 @@ class ExtendedProfile
if (empty($ims)) {
$iArrays[] = array(
// TRANS: Field label for extended profile properties (Instant Messaging).
'label' => _m('IM'),
'type' => 'im'
);
} else {
for ($i = 0; $i < sizeof($ims); $i++) {
$ia = array(
// TRANS: Field label for extended profile properties (Instant Messaging).
'label' => _m('IM'),
'type' => 'im',
'index' => intval($ims[$i]->value_index),
@ -173,12 +177,14 @@ class ExtendedProfile
if (empty($sites)) {
$wArrays[] = array(
// TRANS: Field label for extended profile properties.
'label' => _m('Website'),
'type' => 'website'
);
} else {
for ($i = 0; $i < sizeof($sites); $i++) {
$wa = array(
// TRANS: Field label for extended profile properties.
'label' => _m('Website'),
'type' => 'website',
'index' => intval($sites[$i]->value_index),
@ -202,6 +208,7 @@ class ExtendedProfile
if (empty($companies)) {
$eArrays[] = array(
// TRANS: Field label for extended profile properties.
'label' => _m('Employer'),
'type' => 'experience',
'company' => null,
@ -213,6 +220,7 @@ class ExtendedProfile
} else {
for ($i = 0; $i < sizeof($companies); $i++) {
$ea = array(
// TRANS: Field label for extended profile properties.
'label' => _m('Employer'),
'type' => 'experience',
'company' => $companies[$i]->field_value,
@ -239,6 +247,7 @@ class ExtendedProfile
if (empty($schools)) {
$iArrays[] = array(
'type' => 'education',
// TRANS: Field label for extended profile properties.
'label' => _m('Institution'),
'school' => null,
'degree' => null,
@ -251,6 +260,7 @@ class ExtendedProfile
for ($i = 0; $i < sizeof($schools); $i++) {
$ia = array(
'type' => 'education',
// TRANS: Field label for extended profile properties.
'label' => _m('Institution'),
'school' => $schools[$i]->field_value,
'degree' => isset($degrees[$i]->field_value) ? $degrees[$i]->field_value : null,
@ -275,32 +285,39 @@ class ExtendedProfile
{
return array(
'basic' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Personal'),
'fields' => array(
'fullname' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Full name'),
'profile' => 'fullname',
'vcard' => 'fn',
),
'title' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Title'),
'vcard' => 'title',
),
'manager' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Manager'),
'type' => 'person',
'vcard' => 'x-manager',
),
'location' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Location'),
'profile' => 'location'
),
'bio' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Bio'),
'type' => 'textarea',
'profile' => 'bio',
),
'tags' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Tags'),
'type' => 'tags',
'profile' => 'tags',
@ -308,6 +325,7 @@ class ExtendedProfile
),
),
'contact' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Contact'),
'fields' => array(
'phone' => $this->getPhones(),
@ -316,29 +334,35 @@ class ExtendedProfile
),
),
'personal' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Personal'),
'fields' => array(
'birthday' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Birthday'),
'type' => 'date',
'vcard' => 'bday',
),
'spouse' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Spouse\'s name'),
'vcard' => 'x-spouse',
),
'kids' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Kids\' names')
),
),
),
'experience' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Work experience'),
'fields' => array(
'experience' => $this->getExperiences()
),
),
'education' => array(
// TRANS: Field label for extended profile properties.
'label' => _m('Education'),
'fields' => array(
'education' => $this->getEducation()

View File

@ -80,9 +80,11 @@ class ExtendedProfileWidget extends Form
// For JQuery UI modal dialog
$this->out->elementStart(
'div',
array('id' => 'confirm-dialog', 'title' => 'Confirmation Required')
// TRANS: Title for extended profile entry deletion dialog.
array('id' => 'confirm-dialog', 'title' => _m('Confirmation Required'))
);
$this->out->text('Really delete this entry?');
// TRANS: Confirmation text for extended profile entry deletion dialog.
$this->out->text(_m('Really delete this entry?'));
$this->out->elementEnd('div');
$this->showSections();
}
@ -163,7 +165,9 @@ class ExtendedProfileWidget extends Form
if (!empty($field['value'])) {
$this->out->text($field['value']);
if (!empty($field['rel'])) {
$this->out->text(' (' . $field['rel'] . ')');
// TRANS: Value between parentheses (phone number, website, or IM address).
$outtext = sprintf(_m('(%s)'),$field['rel']);
$this->out->text(' '.$outtext);
}
}
$this->out->elementEnd('div');
@ -174,7 +178,9 @@ class ExtendedProfileWidget extends Form
$this->out->elementStart('div', array('class' => 'im-display'));
$this->out->text($field['value']);
if (!empty($field['rel'])) {
$this->out->text(' (' . $field['rel'] . ')');
// TRANS: Value between parentheses (phone number, website, or IM address).
$outtext = sprintf(_m('(%s)'),$field['rel']);
$this->out->text(' '.$outtext);
}
$this->out->elementEnd('div');
}
@ -196,7 +202,9 @@ class ExtendedProfileWidget extends Form
);
if (!empty($field['rel'])) {
$this->out->text(' (' . $field['rel'] . ')');
// TRANS: Value between parentheses (phone number, website, or IM address).
$outtext = sprintf(_m('(%s)'),$field['rel']);
$this->out->text(' '.$outtext);
}
$this->out->elementEnd('div');
}
@ -314,11 +322,13 @@ class ExtendedProfileWidget extends Form
protected function showExperience($name, $field)
{
$this->out->elementStart('div', 'experience-item');
// TRANS: Field label in experience area of extended profile.
$this->out->element('div', 'label', _m('Company'));
if (!empty($field['company'])) {
$this->out->element('div', 'field', $field['company']);
// TRANS: Field label in experience area of extended profile (when did one start a position).
$this->out->element('div', 'label', _m('Start'));
$this->out->element(
'div',
@ -326,6 +336,7 @@ class ExtendedProfileWidget extends Form
date('j M Y', strtotime($field['start'])
)
);
// TRANS: Field label in experience area of extended profile (when did one end a position).
$this->out->element('div', 'label', _m('End'));
$this->out->element(
'div',
@ -338,7 +349,8 @@ class ExtendedProfileWidget extends Form
$this->out->element(
'div',
array('class' => 'field current'),
'(' . _m('Current') . ')'
// TRANS: Field value in experience area of extended profile (one still holds a position).
_m('(Current)')
);
}
}
@ -356,6 +368,7 @@ class ExtendedProfileWidget extends Form
)
);
// TRANS: Field label in experience edit area of extended profile (which company does one work for).
$this->out->element('div', 'label', _m('Company'));
$this->out->input(
$id,
@ -363,6 +376,7 @@ class ExtendedProfileWidget extends Form
isset($field['company']) ? $field['company'] : null
);
// TRANS: Field label in experience edit area of extended profile (when did one start at a company).
$this->out->element('div', 'label', _m('Start'));
$this->out->input(
$id . '-start',
@ -370,6 +384,7 @@ class ExtendedProfileWidget extends Form
isset($field['start']) ? date('j M Y', strtotime($field['start'])) : null
);
// TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
$this->out->element('div', 'label', _m('End'));
$this->out->input(
@ -384,6 +399,7 @@ class ExtendedProfileWidget extends Form
$this->out->elementStart('div', 'current-checkbox');
$this->out->checkbox(
$id . '-current',
// TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
_m('Current'),
$field['current']
);
@ -396,14 +412,17 @@ class ExtendedProfileWidget extends Form
protected function showEducation($name, $field)
{
$this->out->elementStart('div', 'education-item');
// TRANS: Field label in education area of extended profile.
$this->out->element('div', 'label', _m('Institution'));
if (!empty($field['school'])) {
$this->out->element('div', 'field', $field['school']);
// TRANS: Field label in education area of extended profile.
$this->out->element('div', 'label', _m('Degree'));
$this->out->element('div', 'field', $field['degree']);
// TRANS: Field label in education area of extended profile.
$this->out->element('div', 'label', _m('Description'));
$this->out->element('div', 'field', $field['description']);
// TRANS: Field label in education area of extended profile (when did one start an education).
$this->out->element('div', 'label', _m('Start'));
$this->out->element(
'div',
@ -411,6 +430,7 @@ class ExtendedProfileWidget extends Form
date('j M Y', strtotime($field['start'])
)
);
// TRANS: Field label in education area of extended profile (when did one end a education).
$this->out->element('div', 'label', _m('End'));
$this->out->element(
'div',
@ -432,6 +452,7 @@ class ExtendedProfileWidget extends Form
'class' => 'education-item'
)
);
// TRANS: Field label in education edit area of extended profile.
$this->out->element('div', 'label', _m('Institution'));
$this->out->input(
$id,
@ -439,6 +460,7 @@ class ExtendedProfileWidget extends Form
isset($field['school']) ? $field['school'] : null
);
// TRANS: Field label in education edit area of extended profile.
$this->out->element('div', 'label', _m('Degree'));
$this->out->input(
$id . '-degree',
@ -446,6 +468,7 @@ class ExtendedProfileWidget extends Form
isset($field['degree']) ? $field['degree'] : null
);
// TRANS: Field label in education edit area of extended profile.
$this->out->element('div', 'label', _m('Description'));
$this->out->textarea(
@ -454,17 +477,21 @@ class ExtendedProfileWidget extends Form
isset($field['description']) ? $field['description'] : null
);
// TRANS: Field label in education edit area of extended profile (when did one start an education).
$this->out->element('div', 'label', _m('Start'));
$this->out->input(
$id . '-start',
null,
// @todo FIXME: does date format need i18n? If so, should probly be dealt with in core.
isset($field['start']) ? date('j M Y', strtotime($field['start'])) : null
);
// TRANS: Field label in education edit area of extended profile (when did one end an education).
$this->out->element('div', 'label', _m('End'));
$this->out->input(
$id . '-end',
null,
// @todo FIXME: does date format need i18n? If so, should probly be dealt with in core.
isset($field['end']) ? date('j M Y', strtotime($field['end'])) : null
);
@ -491,7 +518,8 @@ class ExtendedProfileWidget extends Form
'href' => 'javascript://',
'style' => 'display: none;'
),
'Add another item'
// TRANS: Link description in extended profile page to add another profile element.
_m('Add another item')
);
}
@ -601,7 +629,8 @@ class ExtendedProfileWidget extends Form
$this->showEditableEducation($name, $field);
break;
default:
$out->input($id, null, "TYPE: $type");
// TRANS: Field label for undefined field in extended profile.
$out->input($id, null, sprintf(_m('TYPE: %s'),$type));
}
}
@ -610,14 +639,16 @@ class ExtendedProfileWidget extends Form
*
* @return void
*/
function formActions()
{
$this->out->submit(
'save',
// TRANS: Button text for saving extended profile properties.
_m('BUTTON','Save'),
'submit form_action-secondary',
'save',
// TRANS: .
// TRANS: Button title for saving extended profile properties.
_m('Save details')
);
}
@ -627,7 +658,6 @@ class ExtendedProfileWidget extends Form
*
* @return string ID of the form
*/
function id()
{
return 'profile-details-' . $this->profile->id;
@ -638,7 +668,6 @@ class ExtendedProfileWidget extends Form
*
* @return string of the form class
*/
function formClass()
{
return 'form_profile_details form_settings';
@ -649,7 +678,6 @@ class ExtendedProfileWidget extends Form
*
* @return string URL of the action
*/
function action()
{
return common_local_url('profiledetailsettings');