Commit 279dbc5e authored by Jonathan Riddell's avatar Jonathan Riddell 🛶

Merge branch 'https-appdata-urls' into 'master'

Use https: URLs for license, forum and userbase links

See merge request !11
parents ae6b51f8 510ee773
......@@ -155,13 +155,13 @@ class AppData
// $this->name(), $stripped_license, $license);
switch($license) {
case 'GPL-2.0+': case 'GPL-2.0': case 'GPL-2.0-or-later': case 'GPL-2.0-only':
$text .= i18n_var('%1 is distributed under the terms of the <a itemprop"license" href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License (GPL), Version 2</a>.', $this->name());
$text .= i18n_var('%1 is distributed under the terms of the <a itemprop"license" href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License (GPL), Version 2</a>.', $this->name());
break;
case 'GPL-3.0+': case 'GPL-3.0': case 'GPL-3.0-or-later': case 'GPL-3.0-only':
$text .= i18n_var('%1 is distributed under the terms of the <a itemprop="license" href="http://www.gnu.org/licenses/gpl.html">GNU General Public License (GPL), Version 3</a>.', $this->name());
$text .= i18n_var('%1 is distributed under the terms of the <a itemprop="license" href="https://www.gnu.org/licenses/gpl.html">GNU General Public License (GPL), Version 3</a>.', $this->name());
break;
case 'LGPL-2.0-only': case 'LGPL-2.0-or-later': case 'LGPL-2.1-only': case 'LGPL-2.1-or-later': case 'LGPL':
$text .= i18n_var('%1 is distributed under the terms of the <a itemprop="license" href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"> GNU Lesser General Public License, version 2</a>.', $this->name());
$text .= i18n_var('%1 is distributed under the terms of the <a itemprop="license" href="https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"> GNU Lesser General Public License, version 2</a>.', $this->name());
break;
case 'LGPL-3.0-only': case 'LGPL-3.0-or-later': case 'LGPL-3.0':
$text .= i18n_var('%1 is distributed under the terms of the <a itemprop="license" href="https://www.gnu.org/licenses/lgpl.html"> GNU Library General Public License, version 3</a>.', $this->name());
......@@ -240,7 +240,7 @@ class AppData
}
// FIXME: not in appdata
function userbase() {
return "http://userbase.kde.org/".$this->data['userbase'];
return "https://userbase.kde.org/".$this->data['userbase'];
}
function hasHandbook() {
......@@ -253,9 +253,9 @@ class AppData
// AppData extension X-KDE-Forum: <String>
function forumUrl() {
if (isset($this->data['X-KDE-Forum'])) {
return 'http://forum.kde.org/viewforum.php?f='.$this->data['X-KDE-Forum'];
return 'https://forum.kde.org/viewforum.php?f='.$this->data['X-KDE-Forum'];
} else {
return 'http://forum.kde.org/';
return 'https://forum.kde.org/';
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment