wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update translator documentation.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/ExtendedProfile/ExtendedProfilePlugin.php
View File

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

4
plugins/ExtendedProfile/classes/Profile_detail.php
View File

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

24
plugins/ExtendedProfile/lib/extendedprofile.php
View File

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

54
plugins/ExtendedProfile/lib/extendedprofilewidget.php
View File

@ -80,9 +80,11 @@ class ExtendedProfileWidget extends Form
// For JQuery UI modal dialog // For JQuery UI modal dialog
$this->out->elementStart( $this->out->elementStart(
'div', '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->out->elementEnd('div');
$this->showSections(); $this->showSections();
} }
@ -163,7 +165,9 @@ class ExtendedProfileWidget extends Form
if (!empty($field['value'])) { if (!empty($field['value'])) {
$this->out->text($field['value']); $this->out->text($field['value']);
if (!empty($field['rel'])) { 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'); $this->out->elementEnd('div');
@ -174,7 +178,9 @@ class ExtendedProfileWidget extends Form
$this->out->elementStart('div', array('class' => 'im-display')); $this->out->elementStart('div', array('class' => 'im-display'));
$this->out->text($field['value']); $this->out->text($field['value']);
if (!empty($field['rel'])) { 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'); $this->out->elementEnd('div');
} }
@ -196,7 +202,9 @@ class ExtendedProfileWidget extends Form
); );
if (!empty($field['rel'])) { 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'); $this->out->elementEnd('div');
} }
@ -314,11 +322,13 @@ class ExtendedProfileWidget extends Form
protected function showExperience($name, $field) protected function showExperience($name, $field)
{ {
$this->out->elementStart('div', 'experience-item'); $this->out->elementStart('div', 'experience-item');
// TRANS: Field label in experience area of extended profile.
$this->out->element('div', 'label', _m('Company')); $this->out->element('div', 'label', _m('Company'));
if (!empty($field['company'])) { if (!empty($field['company'])) {
$this->out->element('div', 'field', $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', 'label', _m('Start'));
$this->out->element( $this->out->element(
'div', 'div',
@ -326,6 +336,7 @@ class ExtendedProfileWidget extends Form
date('j M Y', strtotime($field['start']) 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', 'label', _m('End'));
$this->out->element( $this->out->element(
'div', 'div',
@ -338,7 +349,8 @@ class ExtendedProfileWidget extends Form
$this->out->element( $this->out->element(
'div', 'div',
array('class' => 'field current'), 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->element('div', 'label', _m('Company'));
$this->out->input( $this->out->input(
$id, $id,
@ -363,6 +376,7 @@ class ExtendedProfileWidget extends Form
isset($field['company']) ? $field['company'] : null 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->element('div', 'label', _m('Start'));
$this->out->input( $this->out->input(
$id . '-start', $id . '-start',
@ -370,6 +384,7 @@ class ExtendedProfileWidget extends Form
isset($field['start']) ? date('j M Y', strtotime($field['start'])) : null 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->element('div', 'label', _m('End'));
$this->out->input( $this->out->input(
@ -384,6 +399,7 @@ class ExtendedProfileWidget extends Form
$this->out->elementStart('div', 'current-checkbox'); $this->out->elementStart('div', 'current-checkbox');
$this->out->checkbox( $this->out->checkbox(
$id . '-current', $id . '-current',
// TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
_m('Current'), _m('Current'),
$field['current'] $field['current']
); );
@ -396,14 +412,17 @@ class ExtendedProfileWidget extends Form
protected function showEducation($name, $field) protected function showEducation($name, $field)
{ {
$this->out->elementStart('div', 'education-item'); $this->out->elementStart('div', 'education-item');
// TRANS: Field label in education area of extended profile.
$this->out->element('div', 'label', _m('Institution')); $this->out->element('div', 'label', _m('Institution'));
if (!empty($field['school'])) { if (!empty($field['school'])) {
$this->out->element('div', 'field', $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', 'label', _m('Degree'));
$this->out->element('div', 'field', $field['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', 'label', _m('Description'));
$this->out->element('div', 'field', $field['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', 'label', _m('Start'));
$this->out->element( $this->out->element(
'div', 'div',
@ -411,6 +430,7 @@ class ExtendedProfileWidget extends Form
date('j M Y', strtotime($field['start']) 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', 'label', _m('End'));
$this->out->element( $this->out->element(
'div', 'div',
@ -432,6 +452,7 @@ class ExtendedProfileWidget extends Form
'class' => 'education-item' 'class' => 'education-item'
) )
); );
// TRANS: Field label in education edit area of extended profile.
$this->out->element('div', 'label', _m('Institution')); $this->out->element('div', 'label', _m('Institution'));
$this->out->input( $this->out->input(
$id, $id,
@ -439,6 +460,7 @@ class ExtendedProfileWidget extends Form
isset($field['school']) ? $field['school'] : null 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->element('div', 'label', _m('Degree'));
$this->out->input( $this->out->input(
$id . '-degree', $id . '-degree',
@ -446,6 +468,7 @@ class ExtendedProfileWidget extends Form
isset($field['degree']) ? $field['degree'] : null 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->element('div', 'label', _m('Description'));
$this->out->textarea( $this->out->textarea(
@ -454,17 +477,21 @@ class ExtendedProfileWidget extends Form
isset($field['description']) ? $field['description'] : null 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->element('div', 'label', _m('Start'));
$this->out->input( $this->out->input(
$id . '-start', $id . '-start',
null, 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 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->element('div', 'label', _m('End'));
$this->out->input( $this->out->input(
$id . '-end', $id . '-end',
null, 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 isset($field['end']) ? date('j M Y', strtotime($field['end'])) : null
); );
@ -491,7 +518,8 @@ class ExtendedProfileWidget extends Form
'href' => 'javascript://', 'href' => 'javascript://',
'style' => 'display: none;' '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); $this->showEditableEducation($name, $field);
break; break;
default: 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 * @return void
*/ */
function formActions() function formActions()
{ {
$this->out->submit( $this->out->submit(
'save', 'save',
// TRANS: Button text for saving extended profile properties.
_m('BUTTON','Save'), _m('BUTTON','Save'),
'submit form_action-secondary', 'submit form_action-secondary',
'save', 'save',
// TRANS: .
// TRANS: Button title for saving extended profile properties.
_m('Save details') _m('Save details')
); );
} }
@ -627,7 +658,6 @@ class ExtendedProfileWidget extends Form
* *
* @return string ID of the form * @return string ID of the form
*/ */
function id() function id()
{ {
return 'profile-details-' . $this->profile->id; return 'profile-details-' . $this->profile->id;
@ -638,7 +668,6 @@ class ExtendedProfileWidget extends Form
* *
* @return string of the form class * @return string of the form class
*/ */
function formClass() function formClass()
{ {
return 'form_profile_details form_settings'; return 'form_profile_details form_settings';
@ -649,7 +678,6 @@ class ExtendedProfileWidget extends Form
* *
* @return string URL of the action * @return string URL of the action
*/ */
function action() function action()
{ {
return common_local_url('profiledetailsettings'); return common_local_url('profiledetailsettings');