diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/api.php | 2 | ||||
| -rw-r--r-- | include/enotify.php | 2 | ||||
| -rw-r--r-- | include/event.php | 2 | ||||
| -rw-r--r-- | include/identity.php | 2 | ||||
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rw-r--r-- | include/language.php | 8 |
6 files changed, 9 insertions, 9 deletions
diff --git a/include/api.php b/include/api.php index b9c4c45a4..12247c183 100644 --- a/include/api.php +++ b/include/api.php @@ -1937,7 +1937,7 @@ require_once('include/items.php'); 'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl, 'shorturllength' => '30', 'redmatrix' => 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 e801c3100..b5495dc7c 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('Red Matrix Notification'); - $product = t('redmatrix'); // RED_PLATFORM; + $product = t('redmatrix'); // 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 5926b50f7..0b1e56ae2 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 7884c04d2..dec3f6e98 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 4e85bef37..1db3fab2b 100755 --- a/include/items.php +++ b/include/items.php @@ -560,7 +560,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); } |