friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Use correct english

This commit is contained in:
Domovoy 2012-08-17 16:40:41 +02:00
parent 429870015f
commit 441c6d79e3
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
object/Conversation.php
View File

@ -15,7 +15,7 @@ require_once('include/text.php');
class Conversation extends BaseObject { class Conversation extends BaseObject {
private $threads = array(); private $threads = array();
private $mode = null; private $mode = null;
private $writeable = false; private $writable = false;
private $profile_owner = 0; private $profile_owner = 0;
public function __construct($mode) { public function __construct($mode) {
@ -35,15 +35,15 @@ class Conversation extends BaseObject {
case 'network': case 'network':
case 'notes': case 'notes':
$this->profile_owner = local_user(); $this->profile_owner = local_user();
$this->writeable = true; $this->writable = true;
break; break;
case 'profile': case 'profile':
$this->profile_owner = $a->profile['profile_uid']; $this->profile_owner = $a->profile['profile_uid'];
$this->writeable = can_write_wall($a,$this->profile_owner); $this->writable = can_write_wall($a,$this->profile_owner);
break; break;
case 'display': case 'display':
$this->profile_owner = $a->profile['uid']; $this->profile_owner = $a->profile['uid'];
$this->writeable = can_write_wall($a,$this->profile_owner); $this->writable = can_write_wall($a,$this->profile_owner);
break; break;
default: default:
logger('[ERROR] Conversation::set_mode : Unhandled mode ('. $mode .').', LOGGER_DEBUG); logger('[ERROR] Conversation::set_mode : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
@ -61,10 +61,10 @@ class Conversation extends BaseObject {
} }
/** /**
* Check if page is writeable * Check if page is writable
*/ */
public function is_writeable() { public function is_writable() {
return $this->writeable; return $this->writable;
} }
/** /**

16
object/Item.php
View File

@ -18,7 +18,7 @@ class Item extends BaseObject {
); );
private $comment_box_template = 'comment_item.tpl'; private $comment_box_template = 'comment_item.tpl';
private $toplevel = false; private $toplevel = false;
private $writeable = false; private $writable = false;
private $children = array(); private $children = array();
private $parent = null; private $parent = null;
private $conversation = null; private $conversation = null;
@ -34,7 +34,7 @@ class Item extends BaseObject {
$this->data = $data; $this->data = $data;
$this->set_template('wall'); $this->set_template('wall');
$this->toplevel = ($this->get_id() == $this->get_data_value('parent')); $this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
$this->writeable = ($this->get_data_value('writable') || $this->get_data_value('self')); $this->writable = ($this->get_data_value('writable') || $this->get_data_value('self'));
$ssl_state = ((local_user()) ? true : false); $ssl_state = ((local_user()) ? true : false);
$this->redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $this->get_data_value('cid') ; $this->redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $this->get_data_value('cid') ;
@ -165,7 +165,7 @@ class Item extends BaseObject {
$indent = 'comment'; $indent = 'comment';
} }
if($conv->is_writeable()) { if($conv->is_writable()) {
$buttons = array( $buttons = array(
'like' => array( t("I like this \x28toggle\x29"), t("like")), 'like' => array( t("I like this \x28toggle\x29"), t("like")),
'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")), 'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
@ -430,10 +430,10 @@ class Item extends BaseObject {
} }
/** /**
* Check if this is writeable * Check if this is writable
*/ */
private function is_writeable() { private function is_writable() {
return $this->writeable; return $this->writable;
} }
/** /**
@ -476,7 +476,7 @@ class Item extends BaseObject {
if( ($conv->get_mode() === 'network') && $this->is_wall_to_wall() ) if( ($conv->get_mode() === 'network') && $this->is_wall_to_wall() )
$ww = 'ww'; $ww = 'ww';
if($conv->is_writeable() && $this->is_writeable()) { if($conv->is_writable() && $this->is_writable()) {
logger('[DEBUG] Item::get_comment_box : Comment box is visible.', LOGGER_DEBUG); logger('[DEBUG] Item::get_comment_box : Comment box is visible.', LOGGER_DEBUG);
$a = $this->get_app(); $a = $this->get_app();
@ -517,7 +517,7 @@ class Item extends BaseObject {
)); ));
} }
else { else {
logger('[DEBUG] Item::get_comment_box : Comment box is NOT visible. Conv: '. ($conv->is_writeable() ? 'yes' : 'no') .' Item: '. ($this->is_writeable() ? 'yes' : 'no'), LOGGER_DEBUG); logger('[DEBUG] Item::get_comment_box : Comment box is NOT visible. Conv: '. ($conv->is_writable() ? 'yes' : 'no') .' Item: '. ($this->is_writable() ? 'yes' : 'no'), LOGGER_DEBUG);
} }
return $comment_box; return $comment_box;