harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix location of string file in Translations.md, fix some permissions and owner vagueness (potential bugs) in profile_tabs()

Browse Source
This commit is contained in:
friendica 2014-01-21 23:09:33 -08:00
parent a13393fb23
commit 3b375a3d3f
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/Translations.md
View File

@ -32,13 +32,13 @@ The location of the translated files in the source tree is
/view/LNG-CODE/ /view/LNG-CODE/
where LNG-CODE is the language code used, e.g. de for German or fr for French. where LNG-CODE is the language code used, e.g. de for German or fr for French.
For the email templates (the *.tpl files) just place them into the directory For the email templates (the *.tpl files) just place them into the directory
and you are done. The translated strings come as a "message.po" file from and you are done. The translated strings come as a "messages.po" file from
transifex which needs to be translated into the PHP file Red uses. To do transifex which needs to be translated into the PHP file Red uses. To do
so, place the file in the directory mentioned above and use the "po2php" so, place the file in the directory mentioned above and use the "po2php"
utility from the util directory of your Red installation. utility from the util directory of your Red installation.
Assuming you want to convert the German localization which is placed in Assuming you want to convert the German localization which is placed in
view/de/message.po you would do the following. view/de/messages.po you would do the following.
1. Navigate at the command prompt to the base directory of your 1. Navigate at the command prompt to the base directory of your
Red installation Red installation
@ -46,7 +46,7 @@ view/de/message.po you would do the following.
2. Execute the po2php script, which will place the translation 2. Execute the po2php script, which will place the translation
in the strings.php file that is used by Red. in the strings.php file that is used by Red.
$> php util/po2php.php view/de/message.po $> php util/po2php.php view/de/messages.po
The output of the script will be placed at view/de/strings.php where The output of the script will be placed at view/de/strings.php where
froemdoca os expecting it, so you can test your translation mmediately. froemdoca os expecting it, so you can test your translation mmediately.

37
include/conversation.php
View File

@ -1432,6 +1432,7 @@ function network_tabs() {
function profile_tabs($a, $is_owner=False, $nickname=Null){ function profile_tabs($a, $is_owner=False, $nickname=Null){
//echo "<pre>"; var_dump($a->user); killme(); //echo "<pre>"; var_dump($a->user); killme();
$channel = $a->get_channel(); $channel = $a->get_channel();
if (is_null($nickname)) if (is_null($nickname))
@ -1451,33 +1452,38 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
'title' => t('Status Messages and Posts'), 'title' => t('Status Messages and Posts'),
'id' => 'status-tab', 'id' => 'status-tab',
), ),
array( );
$p = get_all_perms($a->profile['profile_uid'],get_observer_hash());
if($p['view_profile']) {
$tabs[] = array(
'label' => t('About'), 'label' => t('About'),
'url' => $pr, 'url' => $pr,
'sel' => ((argv(0) == 'profile') ? 'active' : ''), 'sel' => ((argv(0) == 'profile') ? 'active' : ''),
'title' => t('Profile Details'), 'title' => t('Profile Details'),
'id' => 'profile-tab', 'id' => 'profile-tab',
), );
array( }
if($p['view_photos']) {
$tabs[] = array(
'label' => t('Photos'), 'label' => t('Photos'),
'url' => $a->get_baseurl() . '/photos/' . $nickname, 'url' => $a->get_baseurl() . '/photos/' . $nickname,
'sel' => ((argv(0) == 'photos') ? 'active' : ''), 'sel' => ((argv(0) == 'photos') ? 'active' : ''),
'title' => t('Photo Albums'), 'title' => t('Photo Albums'),
'id' => 'photo-tab', 'id' => 'photo-tab',
), );
}
array( if($p['view_storage']) {
$tabs[] = array(
'label' => t('Files'), 'label' => t('Files'),
'url' => $a->get_baseurl() . '/cloud/' . $nickname, 'url' => $a->get_baseurl() . '/cloud/' . $nickname,
'sel' => ((argv(0) == 'cloud') ? 'active' : ''), 'sel' => ((argv(0) == 'cloud') ? 'active' : ''),
'title' => t('Files and Storage'), 'title' => t('Files and Storage'),
'id' => 'files-tab', 'id' => 'files-tab',
), );
}
); if($is_owner) {
if ($is_owner){
$tabs[] = array( $tabs[] = array(
'label' => t('Events'), 'label' => t('Events'),
'url' => $a->get_baseurl() . '/events', 'url' => $a->get_baseurl() . '/events',
@ -1485,15 +1491,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
'title' => t('Events and Calendar'), 'title' => t('Events and Calendar'),
'id' => 'events-tab', 'id' => 'events-tab',
); );
if(feature_enabled(local_user(),'webpages')){ }
if($is_owner && feature_enabled($a->profile['profile_uid'],'webpages')) {
$tabs[] = array( $tabs[] = array(
'label' => t('Webpages'), 'label' => t('Webpages'),
'url' => $a->get_baseurl() . '/webpages/' . $nickname, 'url' => $a->get_baseurl() . '/webpages/' . $nickname,
'sel' => ((argv(0) == 'webpages') ? 'active' : ''), 'sel' => ((argv(0) == 'webpages') ? 'active' : ''),
'title' => t('Manage Webpages'), 'title' => t('Manage Webpages'),
'id' => 'webpages-tab', 'id' => 'webpages-tab',
);} );
} }
else { else {
// FIXME // FIXME
// we probably need a listing of events that were created by // we probably need a listing of events that were created by

1
mod/channel.php
View File

@ -28,6 +28,7 @@ function channel_init(&$a) {
$profile = 0; $profile = 0;
$channel = $a->get_channel(); $channel = $a->get_channel();
logger('channel: ' . $channel['channel_name']);
if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
$which = $channel['channel_address']; $which = $channel['channel_address'];