We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 756dd155 authored by Brion Vibber's avatar Brion Vibber

i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form.

Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
parent b76b0d3a
...@@ -491,11 +491,15 @@ class RegisterAction extends Action ...@@ -491,11 +491,15 @@ class RegisterAction extends Action
$this->elementStart('li'); $this->elementStart('li');
$this->element('input', $attrs); $this->element('input', $attrs);
$this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
$this->text(_('My text and files are available under ')); $message = _('My text and files are available under %s ' .
$this->element('a', array('href' => common_config('license', 'url')), 'except this private data: password, ' .
common_config('license', 'title'), _("Creative Commons Attribution 3.0")); 'email address, IM address, and phone number.');
$this->text(_(' except this private data: password, '. $link = '<a href="' .
'email address, IM address, and phone number.')); htmlspecialchars(common_config('license', 'url')) .
'">' .
htmlspecialchars(common_config('license', 'title')) .
'</a>';
$this->raw(sprintf(htmlspecialchars($message), $link));
$this->elementEnd('label'); $this->elementEnd('label');
$this->elementEnd('li'); $this->elementEnd('li');
} }
......
...@@ -138,6 +138,11 @@ class FBConnectauthAction extends Action ...@@ -138,6 +138,11 @@ class FBConnectauthAction extends Action
parent::showPage(); parent::showPage();
} }
/**
* @fixme much of this duplicates core code, which is very fragile.
* Should probably be replaced with an extensible mini version of
* the core registration form.
*/
function showContent() function showContent()
{ {
if (!empty($this->message_text)) { if (!empty($this->message_text)) {
...@@ -159,10 +164,15 @@ class FBConnectauthAction extends Action ...@@ -159,10 +164,15 @@ class FBConnectauthAction extends Action
'name' => 'license', 'name' => 'license',
'value' => 'true')); 'value' => 'true'));
$this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
$this->text(_m('My text and files are available under ')); $message = _('My text and files are available under %s ' .
$this->element('a', array('href' => common_config('license', 'url')), 'except this private data: password, ' .
common_config('license', 'title')); 'email address, IM address, and phone number.');
$this->text(_m(' except this private data: password, email address, IM address, phone number.')); $link = '<a href="' .
htmlspecialchars(common_config('license', 'url')) .
'">' .
htmlspecialchars(common_config('license', 'title')) .
'</a>';
$this->raw(sprintf(htmlspecialchars($message), $link));
$this->elementEnd('label'); $this->elementEnd('label');
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
......
...@@ -79,6 +79,11 @@ class FinishopenidloginAction extends Action ...@@ -79,6 +79,11 @@ class FinishopenidloginAction extends Action
$this->showPage(); $this->showPage();
} }
/**
* @fixme much of this duplicates core code, which is very fragile.
* Should probably be replaced with an extensible mini version of
* the core registration form.
*/
function showContent() function showContent()
{ {
if (!empty($this->message_text)) { if (!empty($this->message_text)) {
...@@ -110,10 +115,15 @@ class FinishopenidloginAction extends Action ...@@ -110,10 +115,15 @@ class FinishopenidloginAction extends Action
'value' => 'true')); 'value' => 'true'));
$this->elementStart('label', array('for' => 'license', $this->elementStart('label', array('for' => 'license',
'class' => 'checkbox')); 'class' => 'checkbox'));
$this->text(_m('My text and files are available under ')); $message = _('My text and files are available under %s ' .
$this->element('a', array('href' => common_config('license', 'url')), 'except this private data: password, ' .
common_config('license', 'title')); 'email address, IM address, and phone number.');
$this->text(_m(' except this private data: password, email address, IM address, phone number.')); $link = '<a href="' .
htmlspecialchars(common_config('license', 'url')) .
'">' .
htmlspecialchars(common_config('license', 'title')) .
'</a>';
$this->raw(sprintf(htmlspecialchars($message), $link));
$this->elementEnd('label'); $this->elementEnd('label');
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
......
...@@ -332,6 +332,11 @@ class TwitterauthorizationAction extends Action ...@@ -332,6 +332,11 @@ class TwitterauthorizationAction extends Action
parent::showPage(); parent::showPage();
} }
/**
* @fixme much of this duplicates core code, which is very fragile.
* Should probably be replaced with an extensible mini version of
* the core registration form.
*/
function showContent() function showContent()
{ {
if (!empty($this->message_text)) { if (!empty($this->message_text)) {
...@@ -353,10 +358,15 @@ class TwitterauthorizationAction extends Action ...@@ -353,10 +358,15 @@ class TwitterauthorizationAction extends Action
'name' => 'license', 'name' => 'license',
'value' => 'true')); 'value' => 'true'));
$this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
$this->text(_('My text and files are available under ')); $message = _('My text and files are available under %s ' .
$this->element('a', array('href' => common_config('license', 'url')), 'except this private data: password, ' .
common_config('license', 'title')); 'email address, IM address, and phone number.');
$this->text(_(' except this private data: password, email address, IM address, phone number.')); $link = '<a href="' .
htmlspecialchars(common_config('license', 'url')) .
'">' .
htmlspecialchars(common_config('license', 'title')) .
'</a>';
$this->raw(sprintf(htmlspecialchars($message), $link));
$this->elementEnd('label'); $this->elementEnd('label');
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment