aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-13 17:07:12 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-13 17:07:12 -0700
commit475dc7b686d6939d88c79dd58df1ff751356a922 (patch)
tree1271d12c627d8bd3826119df08e9d2c9477be3aa /include
parent4ca06ebd79b5258c5cb6ccb0871d98c9180f91b2 (diff)
parentc82082d2bbb00294d62330d577dcdbc9ec6b9d1c (diff)
downloadvolse-hubzilla-475dc7b686d6939d88c79dd58df1ff751356a922.tar.gz
volse-hubzilla-475dc7b686d6939d88c79dd58df1ff751356a922.tar.bz2
volse-hubzilla-475dc7b686d6939d88c79dd58df1ff751356a922.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: boot.php include/api.php include/enotify.php
Diffstat (limited to 'include')
-rw-r--r--include/api.php2
-rw-r--r--include/enotify.php2
-rw-r--r--include/event.php2
-rw-r--r--include/identity.php2
-rwxr-xr-xinclude/items.php2
-rw-r--r--include/language.php8
6 files changed, 9 insertions, 9 deletions
diff --git a/include/api.php b/include/api.php
index 7fea00d81..a99ec8c0d 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1936,7 +1936,7 @@ require_once('include/items.php');
'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
'shorturllength' => '30',
'hubzilla' => array(
- 'RED_PLATFORM' => RED_PLATFORM,
+ 'PLATFORM_NAME' => PLATFORM_NAME,
'RED_VERSION' => RED_VERSION,
'ZOT_REVISION' => ZOT_REVISION,
'DB_UPDATE_VERSION' => DB_UPDATE_VERSION
diff --git a/include/enotify.php b/include/enotify.php
index 3f54c6915..47499dcee 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -56,7 +56,7 @@ function notification($params) {
push_lang($recip['account_language']); // should probably have a channel language
$banner = t('Hubzilla Notification');
- $product = t('hubzilla'); // RED_PLATFORM;
+ $product = t('hubzilla'); // PLATFORM_NAME;
$siteurl = $a->get_baseurl(true);
$thanks = t('Thank You,');
$sitename = get_config('system','sitename');
diff --git a/include/event.php b/include/event.php
index 485379673..d13ffbaee 100644
--- a/include/event.php
+++ b/include/event.php
@@ -62,7 +62,7 @@ function ical_wrapper($ev) {
$o .= "BEGIN:VCALENDAR";
$o .= "\nVERSION:2.0";
$o .= "\nMETHOD:PUBLISH";
- $o .= "\nPRODID:-//" . get_config('system','sitename') . "//" . RED_PLATFORM . "//" . strtoupper(get_app()->language). "\n";
+ $o .= "\nPRODID:-//" . get_config('system','sitename') . "//" . PLATFORM_NAME . "//" . strtoupper(get_app()->language). "\n";
if(array_key_exists('start', $ev))
$o .= format_event_ical($ev);
else {
diff --git a/include/identity.php b/include/identity.php
index 0b614a00e..9b0c7440c 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -481,7 +481,7 @@ function identity_basic_export($channel_id, $items = false) {
$ret = array();
- $ret['compatibility'] = array('project' => RED_PLATFORM, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION);
+ $ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION);
$r = q("select * from channel where channel_id = %d limit 1",
intval($channel_id)
diff --git a/include/items.php b/include/items.php
index 88f110959..fb228b3a8 100755
--- a/include/items.php
+++ b/include/items.php
@@ -554,7 +554,7 @@ function get_feed_for($channel, $observer_hash, $params) {
$atom .= replace_macros($feed_template, array(
'$version' => xmlify(RED_VERSION),
- '$red' => xmlify(RED_PLATFORM),
+ '$red' => xmlify(PLATFORM_NAME),
'$feed_id' => xmlify($channel['xchan_url']),
'$feed_title' => xmlify($channel['channel_name']),
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
diff --git a/include/language.php b/include/language.php
index 0af72142f..7dbe3dd02 100644
--- a/include/language.php
+++ b/include/language.php
@@ -159,10 +159,10 @@ function t($s, $ctx = '') {
if (x($a->strings, $cs)) {
$t = $a->strings[$cs];
- return ((is_array($t)) ? translate_product($t[0]) : translate_product($t));
+ return ((is_array($t)) ? translate_projectname($t[0]) : translate_projectname($t));
}
- return translate_product($s);
+ return translate_projectname($s);
}
/**
@@ -170,9 +170,9 @@ function t($s, $ctx = '') {
* Merging strings from different project names is problematic so we'll do that with a string replacement
*/
-function translate_product($s) {
+function translate_projectname($s) {
- return str_replace(array('$product','$Product'),array(RED_PLATFORM,ucfirst(RED_PLATFORM)),$s);
+ return str_replace(array('$projectname','$Projectname'),array(PLATFORM_NAME,ucfirst(PLATFORM_NAME)),$s);
}