Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11933 -r11952
--- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11933)
+++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11952)
@@ -1362,5 +1362,7 @@
INSERT INTO ConfigurationAdmin VALUES ('UseModalWindows', 'la_section_SettingsAdmin', 'la_config_UseModalWindows', 'checkbox', '', '', 40.10, 0, 0);
INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseModalWindows', '1', 'In-Portal', 'in-portal:configure_advanced');
+UPDATE `Language` SET UserDocsUrl = 'http://docs.in-portal.org/eng';
+
DELETE FROM Modules WHERE Name = 'Proj-Base';
UPDATE Modules SET Version = '5.0.0', Loaded = 1 WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/RC/core/units/general/helpers/language_import_helper.php
===================================================================
diff -u -N -r11892 -r11952
--- branches/RC/core/units/general/helpers/language_import_helper.php (.../language_import_helper.php) (revision 11892)
+++ branches/RC/core/units/general/helpers/language_import_helper.php (.../language_import_helper.php) (revision 11952)
@@ -1,6 +1,6 @@
_exportEncoding.'">'.$row['DateFormat'].'';
$ret .= ''.$row['TimeFormat'].''.$row['InputDateFormat'].'';
$ret .= ''.$row['InputTimeFormat'].''.$row['DecimalPoint'].'';
- $ret .= ''.$row['ThousandSep'].''.$row['Charset'].'';
+ $ret .= ''.$row['ThousandSep'].''.$row['Charset'].''.$row['UserDocsUrl'].'';
$ret .= ''.$row['UnitSystem'].''."\n";
// phrases
@@ -415,6 +415,7 @@
'THOUSANDS' => 'ThousandSep',
'CHARSET' => 'Charset',
'UNITSYSTEM' => 'UnitSystem',
+ 'DOCS_URL' => 'UserDocsUrl',
);
do {
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11949 -r11952
--- branches/RC/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 11949)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 11952)
@@ -51,7 +51,7 @@
-
+
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -N -r11931 -r11952
--- branches/RC/core/install/english.lang (.../english.lang) (revision 11931)
+++ branches/RC/core/install/english.lang (.../english.lang) (revision 11952)
@@ -1,5 +1,5 @@
- m/d/Yg:i:s Am/d/Yg:i:s A.,utf-82
+ m/d/Yg:i:s Am/d/Yg:i:s A.,utf-8http://docs.in-portal.org/eng2
WW91ciBwYXNzd29yZCBoYXMgYmVlbiByZXNldC4gWW91IHdpbGwgcmVjZWl2ZSB5b3VyIG5ldyBwYXNzd29yZCBpbiB0aGUgZW1haWwgc2hvcnRseS4=
QmxvY2sgU2hpcHBpbmcgQWRkcmVzcyBFZGl0aW5n
|