joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-25 23:02:55 +00:00
Code Packages Releases Activity

[#27818] Update 1.7 strings to 2.5. Thanks Christophe

Browse Source
This commit is contained in:
chdemko 2012-01-30 08:12:36 +01:00 committed by Jean-Marie Simonet
parent 108ddcca2d
commit 0df720326e
8 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.txt
View File

@ -1,7 +1,7 @@
1- What is this?
* This is a Joomla! installation/upgrade package to version 1.7.x
* This is a Joomla! installation/upgrade package to version 2.5.x
* Joomla! Official site: http://www.joomla.org
* Joomla 1.7 version history - http://docs.joomla.org/Joomla_1.7_version_history
* Joomla 2.5 version history - http://docs.joomla.org/Joomla_2.5_version_history
* Detailed changes in the Changelog: http://joomlacode.org/gf/project/joomla/scmsvn/?action=browse&path=/development/trunk/administrator/&view=log
2- What is Joomla?
@ -49,10 +49,10 @@
* Post questions at our forums: http://forum.joomla.org
* Joomla Resources Directory (JRD): http://resources.joomla.org/tos.html
11- Already have a site but its not built with Joomla 1.7 ?
* What's new in Joomla 1.6+ - http://docs.joomla.org/What%27s_new_in_Joomla_1.6
* What are the main differences from 1.5 to 1.6+ ? Table of contents: http://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_1.6
* How to migrate from 1.5.x ? Tutorial: http://docs.joomla.org/Tutorial:Migrating_from_Joomla_1.5_to_Joomla_1.6
11- Already have a site but its not built with Joomla 2.5 ?
* What's new in Joomla 2.5+ - http://docs.joomla.org/What%27s_new_in_Joomla_2.5
* What are the main differences from 1.5 to 2.5+ ? Table of contents: http://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_2.5
* How to migrate from 1.5.x ? Tutorial: http://docs.joomla.org/Tutorial:Migrating_from_Joomla_1.5_to_Joomla_2.5
* Upgrade Instructions: http://docs.joomla.org/Upgrade_Instructions
* Convert an existing Web site to Joomla - http://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site

3
installation/CHANGELOG
View File

@ -26,6 +26,9 @@ $ -> Language fix or change
- -> Removed
! -> Note
30-Jan-2012 Jean-Marie Simonet
[#27818] Update 1.7 strings to 2.5. Thanks Christophe
30-Jan-2012 Mark Dexter
# [#27887] Extension Manager: Database does not fix update problem
# [#27886] An unpublished linked contact leads to articles not being displayed.

2
libraries/joomla/document/feed/renderer/atom.php
View File

@ -108,7 +108,7 @@ class JDocumentRendererAtom extends JDocumentRenderer
}
$feed .= " </author>\n";
}
$feed .= " <generator uri=\"http://joomla.org\" version=\"1.6\">" . $data->getGenerator() . "</generator>\n";
$feed .= " <generator uri=\"http://joomla.org\" version=\"2.5\">" . $data->getGenerator() . "</generator>\n";
$feed .= ' <link rel="self" type="application/atom+xml" href="' . str_replace(' ', '%20', $url . $syndicationURL) . "\"/>\n";
for ($i = 0, $count = count($data->items); $i < $count; $i++)

2
libraries/joomla/environment/response.php
View File

@ -296,7 +296,7 @@ class JResponse
$gzdata = gzencode($data, $level);
self::setHeader('Content-Encoding', $encoding);
self::setHeader('X-Content-Encoded-By', 'Joomla! 1.6');
self::setHeader('X-Content-Encoded-By', 'Joomla! 2.5');
return $gzdata;
}

2
plugins/quickicon/extensionupdate/extensionupdate.xml
View File

@ -7,7 +7,7 @@
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<version>1.7.1</version>
<version>2.5.0</version>
<description>PLG_QUICKICON_EXTENSIONUPDATE_XML_DESCRIPTION</description>
<files>
<filename plugin="extensionupdate">extensionupdate.php</filename>

2
plugins/quickicon/joomlaupdate/joomlaupdate.xml
View File

@ -7,7 +7,7 @@
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<version>1.7.1</version>
<version>2.5.0</version>
<description>PLG_QUICKICON_JOOMLAUPDATE_XML_DESCRIPTION</description>
<files>
<filename plugin="joomlaupdate">joomlaupdate.php</filename>

2
templates/beez5/templateDetails.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE install PUBLIC "-//Joomla! 1.6//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd">
<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd">
<extension version="2.5" type="template" client="site">
<name>beez5</name>
<creationDate>21 May 2010</creationDate>

2
templates/beez_20/templateDetails.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE install PUBLIC "-//Joomla! 1.6//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd">
<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd">
<extension version="2.5" type="template" client="site">
<name>beez_20</name>
<creationDate>25 November 2009</creationDate>