Browse Source

rev update

pull/514/merge
friendica 9 years ago
parent
commit
dec5298248
  1. 2
      boot.php
  2. 2
      mod/admin.php
  3. 2
      mod/install.php
  4. 5
      mod/notifications.php
  5. 1057
      util/messages.po

2
boot.php

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1492' );
define ( 'FRIENDICA_VERSION', '3.0.1496' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1156 );

2
mod/admin.php

@ -448,7 +448,7 @@ function admin_page_site(&$a) {
'$baseurl' => $a->get_baseurl(true),
// name, label, value, help string, extra data...
'$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""),
'$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), 'UTF-8'),
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
'$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
'$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),

2
mod/install.php

@ -447,7 +447,7 @@ function check_htaccess(&$checks) {
function manual_config(&$a) {
$data = htmlentities($a->data['txt']);
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
return $o;

5
mod/notifications.php

@ -69,6 +69,9 @@ function notifications_content(&$a) {
nav_set_selected('notifications');
$json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
$o = '';
$tabs = array(
array(
@ -211,7 +214,7 @@ function notifications_content(&$a) {
}
else
info( t('No introductions.') . EOL);
$o .= replace_macros($notif_tpl,array(
'$notif_header' => t('Notifications'),
'$tabs' => $tabs,

1057
util/messages.po
File diff suppressed because it is too large
View File

Loading…
Cancel
Save