GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Update translator documentation and L10n.

Browse Source
This commit is contained in:
Siebrand Mazeland 2011-05-20 16:03:29 +02:00
parent 1a165a5636
commit 1d1a929718
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,7 +328,7 @@ class ExtendedProfileWidget extends Form
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). // TRANS: Field label in extended profile (when did one start a position or education).
$this->out->element('div', 'label', _m('Start')); $this->out->element('div', 'label', _m('Start'));
$this->out->element( $this->out->element(
'div', 'div',
@ -336,7 +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). // TRANS: Field label in extended profile (when did one end a position or education).
$this->out->element('div', 'label', _m('End')); $this->out->element('div', 'label', _m('End'));
$this->out->element( $this->out->element(
'div', 'div',
@ -376,7 +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). // TRANS: Field label in extended profile (when did one start a position or 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',
@ -384,7 +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). // TRANS: Field label in extended profile (when did one end a position or education).
$this->out->element('div', 'label', _m('End')); $this->out->element('div', 'label', _m('End'));
$this->out->input( $this->out->input(
@ -416,13 +416,13 @@ class ExtendedProfileWidget extends Form
$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. // TRANS: Field label in extended profile for specifying an academic degree.
$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. // 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). // TRANS: Field label in extended profile (when did one start a position or education).
$this->out->element('div', 'label', _m('Start')); $this->out->element('div', 'label', _m('Start'));
$this->out->element( $this->out->element(
'div', 'div',
@ -430,7 +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). // TRANS: Field label in extended profile (when did one end a position or education).
$this->out->element('div', 'label', _m('End')); $this->out->element('div', 'label', _m('End'));
$this->out->element( $this->out->element(
'div', 'div',
@ -460,7 +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. // TRANS: Field label in extended profile for specifying an academic degree.
$this->out->element('div', 'label', _m('Degree')); $this->out->element('div', 'label', _m('Degree'));
$this->out->input( $this->out->input(
$id . '-degree', $id . '-degree',
@ -477,7 +477,7 @@ 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). // TRANS: Field label in extended profile (when did one start a position or 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',
@ -486,7 +486,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 education edit area of extended profile (when did one end an education). // TRANS: Field label in extended profile (when did one end a position or 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',

6
plugins/OStatus/OStatusPlugin.php
View File

@ -327,7 +327,8 @@ class OStatusPlugin extends Plugin
return false; return false;
} catch (Exception $e) { } catch (Exception $e) {
// TRANS: Error message in OStatus plugin. // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
// TRANS: and example.net, as these are official standard domain names for use in examples.
$err = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); $err = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
} }
@ -360,7 +361,8 @@ class OStatusPlugin extends Plugin
return $this->filter(array($oprofile->localProfile())); return $this->filter(array($oprofile->localProfile()));
} catch (Exception $e) { } catch (Exception $e) {
// TRANS: Error message in OStatus plugin. // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
// TRANS: and example.net, as these are official standard domain names for use in examples.
$this->msg = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); $this->msg = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
return array(); return array();
} }

3
plugins/OStatus/actions/ostatusgroup.php
View File

@ -77,7 +77,8 @@ class OStatusGroupAction extends OStatusSubAction
// TRANS: Field label. // TRANS: Field label.
_m('Join group'), _m('Join group'),
$this->profile_uri, $this->profile_uri,
// TRANS: Tooltip for field label "Join group". // TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
// TRANS: domain name in the URL, as it is an official standard domain name for examples.
_m("OStatus group's address, like http://example.net/group/nickname.")); _m("OStatus group's address, like http://example.net/group/nickname."));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');

9
plugins/OStatus/actions/ostatussub.php
View File

@ -228,14 +228,16 @@ class OStatusSubAction extends Action
} else if (Validate::uri($this->profile_uri)) { } else if (Validate::uri($this->profile_uri)) {
$this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri); $this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri);
} else { } else {
// TRANS: Error text. // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
// TRANS: and example.net, as these are official standard domain names for use in examples.
$this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
common_debug('Invalid address format.', __FILE__); common_debug('Invalid address format.', __FILE__);
return false; return false;
} }
return true; return true;
} catch (FeedSubBadURLException $e) { } catch (FeedSubBadURLException $e) {
// TRANS: Error text. // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
// TRANS: and example.net, as these are official standard domain names for use in examples.
$this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
common_debug('Invalid URL or could not reach server.', __FILE__); common_debug('Invalid URL or could not reach server.', __FILE__);
} catch (FeedSubBadResponseException $e) { } catch (FeedSubBadResponseException $e) {
@ -260,7 +262,8 @@ class OStatusSubAction extends Action
common_debug('Not a recognized feed type.', __FILE__); common_debug('Not a recognized feed type.', __FILE__);
} catch (Exception $e) { } catch (Exception $e) {
// Any new ones we forgot about // Any new ones we forgot about
// TRANS: Error text. // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
// TRANS: and example.net, as these are official standard domain names for use in examples.
$this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
common_debug(sprintf('Bad feed URL: %s %s', get_class($e), $e->getMessage()), __FILE__); common_debug(sprintf('Bad feed URL: %s %s', get_class($e), $e->getMessage()), __FILE__);
} }

2
plugins/OStatus/actions/ostatustag.php
View File

@ -74,7 +74,7 @@ class OStatusTagAction extends OStatusInitAction
// TRANS: Field label. // TRANS: Field label.
$this->input('profile', _m('Profile Account'), $this->profile, $this->input('profile', _m('Profile Account'), $this->profile,
// TRANS: Field title. // TRANS: Field title.
_m('Your account id (i.e. user@identi.ca).')); _m('Your account id (for example user@identi.ca).'));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->submit('submit', $submit); $this->submit('submit', $submit);