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

Resolve conflicts and convert _t( to _( where it was introduced again.

Browse Source 
darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
This commit is contained in:
Mike Cochrane 2008-07-10 00:51:26 -04:00
parent 4b656f47df
commit 7e38142d4a
9 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/login.php
View File

@ -66,7 +66,7 @@ class LoginAction extends Action {
# success! # success!
if (!common_set_user($user)) { if (!common_set_user($user)) {
common_server_error(_t('Error setting user.')); common_server_error(_('Error setting user.'));
return; return;
} }

2
actions/register.php
View File

@ -66,7 +66,7 @@ class RegisterAction extends Action {
} else { } else {
$user = $this->register_user($nickname, $password, $email); $user = $this->register_user($nickname, $password, $email);
if (!$user) { if (!$user) {
$this->show_form(_t('Invalid username or password.')); $this->show_form(_('Invalid username or password.'));
return; return;
} }
# success! # success!

14
actions/showstream.php
View File

@ -337,7 +337,7 @@ class ShowstreamAction extends StreamAction {
common_element('h2', NULL, _('Currently')); common_element('h2', NULL, _('Currently'));
$notice = $profile->getCurrentNotice(); $notice = $profile->getCurrentNotice();
if ($notice) { if ($notice) {
# FIXME: URL, image, video, audio # FIXME: URL, image, video, audio
common_element_start('p', array('class' => 'notice_current')); common_element_start('p', array('class' => 'notice_current'));
@ -375,11 +375,19 @@ class ShowstreamAction extends StreamAction {
'href' => $noticeurl, 'href' => $noticeurl,
'title' => common_exact_date($notice->created)), 'title' => common_exact_date($notice->created)),
common_date_string($notice->created)); common_date_string($notice->created));
common_element_start('a', if ($notice->reply_to) {
$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
common_text(' (');
common_element('a', array('class' => 'inreplyto',
'href' => $replyurl),
_('in reply to...'));
common_text(')');
}
common_element_start('a',
array('href' => common_local_url('newnotice', array('href' => common_local_url('newnotice',
array('replyto' => $profile->nickname)), array('replyto' => $profile->nickname)),
'onclick' => 'doreply("'.$profile->nickname.'"); return false', 'onclick' => 'doreply("'.$profile->nickname.'"); return false',
'title' => _t('reply'), 'title' => _('reply'),
'class' => 'replybutton')); 'class' => 'replybutton'));
common_raw('→'); common_raw('→');
common_element_end('a'); common_element_end('a');

7
classes/Notice.php
View File

@ -33,11 +33,12 @@ class Notice extends DB_DataObject
public $id; // int(4) primary_key not_null public $id; // int(4) primary_key not_null
public $profile_id; // int(4) not_null public $profile_id; // int(4) not_null
public $uri; // varchar(255) unique_key public $uri; // varchar(255) unique_key
public $content; // varchar(140) public $content; // varchar(140)
public $url; // varchar(255) public $rendered; // text()
public $url; // varchar(255)
public $created; // datetime() not_null public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
public $reply_to; // int(4) public $reply_to; // int(4)
/* Static get */ /* Static get */
function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Notice',$k,$v); } function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Notice',$k,$v); }

12
classes/Profile.php
View File

@ -31,12 +31,12 @@ class Profile extends DB_DataObject
public $__table = 'profile'; // table name public $__table = 'profile'; // table name
public $id; // int(4) primary_key not_null public $id; // int(4) primary_key not_null
public $nickname; // varchar(64) not_null public $nickname; // varchar(64) multiple_key not_null
public $fullname; // varchar(255) public $fullname; // varchar(255) multiple_key
public $profileurl; // varchar(255) public $profileurl; // varchar(255)
public $homepage; // varchar(255) public $homepage; // varchar(255) multiple_key
public $bio; // varchar(140) public $bio; // varchar(140) multiple_key
public $location; // varchar(255) public $location; // varchar(255) multiple_key
public $created; // datetime() not_null public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP

4
classes/Reply.php
View File

@ -12,9 +12,9 @@ class Reply extends DB_DataObject
public $__table = 'reply'; // table name public $__table = 'reply'; // table name
public $notice_id; // int(4) primary_key not_null public $notice_id; // int(4) primary_key not_null
public $profile_id; // int(4) primary_key not_null public $profile_id; // int(4) primary_key not_null
public $replied_id; // int(4) public $replied_id; // int(4)
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
public $replied_id; // int(4) public $replied_id; // int(4)
/* Static get */ /* Static get */
function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Reply',$k,$v); } function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Reply',$k,$v); }

4
lib/settingsaction.php
View File

@ -100,8 +100,8 @@ class SettingsAction extends Action {
common_element_start('ul', array('id' => 'nav_views')); common_element_start('ul', array('id' => 'nav_views'));
foreach ($menu as $menuaction => $menudesc) { foreach ($menu as $menuaction => $menudesc) {
common_menu_item(common_local_url($menuaction), common_menu_item(common_local_url($menuaction),
_t($menudesc[0]), _($menudesc[0]),
_t($menudesc[1]), _($menudesc[1]),
$action == $menuaction); $action == $menuaction);
} }
common_element_end('ul'); common_element_end('ul');

4
lib/stream.php
View File

@ -98,14 +98,14 @@ class StreamAction extends Action {
common_text(' ('); common_text(' (');
common_element('a', array('class' => 'inreplyto', common_element('a', array('class' => 'inreplyto',
'href' => $replyurl), 'href' => $replyurl),
_t(' in reply to...')); _('in reply to...'));
common_text(')'); common_text(')');
} }
common_element_start('a', common_element_start('a',
array('href' => common_local_url('newnotice', array('href' => common_local_url('newnotice',
array('replyto' => $profile->nickname)), array('replyto' => $profile->nickname)),
'onclick' => 'doreply("'.$profile->nickname.'"); return false', 'onclick' => 'doreply("'.$profile->nickname.'"); return false',
'title' => _t('reply'), 'title' => _('reply'),
'class' => 'replybutton')); 'class' => 'replybutton'));
common_raw('→'); common_raw('→');
common_element_end('a'); common_element_end('a');

3
lib/util.php
View File

@ -277,7 +277,8 @@ function common_nav_menu() {
common_menu_item(common_local_url('all', array('nickname' => $user->nickname)), common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
_('Home')); _('Home'));
} }
common_menu_item(common_local_url('public'), _t('Public')); common_menu_item(common_local_url('public'), _('Public'));
common_menu_item(common_local_url('peoplesearch'), _('Search'));
common_menu_item(common_local_url('doc', array('title' => 'help')), common_menu_item(common_local_url('doc', array('title' => 'help')),
_('Help')); _('Help'));
if ($user) { if ($user) {