Git commit efb11fd0979455112ea7f0a84a3e150e00928998 by Yuri Chornoivan. Committed on 12/11/2019 at 16:51. Pushed by yurchor into branch 'master'.
Use URLs with transport encryption M +1 -1 CMakeLists.txt M +7 -7 docs/parley/index.docbook M +1 -1 plasmoid/plasma_parley.desktop M +1 -1 plugins/example.desktop M +1 -1 plugins/google_dictionary.desktop M +1 -1 plugins/google_dictionary.py M +1 -1 plugins/leo-dict.desktop M +5 -5 plugins/leo-dict.py M +1 -1 plugins/test.desktop M +2 -2 plugins/wiktionary/wiktionary_sound.desktop M +1 -1 scripts_test/google_translation.py M +3 -3 scripts_test/myscript.py M +1 -1 src/settings/parley.kcfg M +1 -1 tipofday/tips https://commits.kde.org/parley/efb11fd0979455112ea7f0a84a3e150e00928998 diff --git a/CMakeLists.txt b/CMakeLists.txt index 876cce8f..d57e1af8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ set_package_properties(LibXml2 PROPERTIES #@todo frameworks restore Xattica # find_package(LibAttica) -# macro_log_feature(LIBATTICA_FOUND "libattica" "A library to access Open Collaboration Service providers" "http://kde.org"; FALSE "" "Required to access OCS providers in get hot new stuff.") +# macro_log_feature(LIBATTICA_FOUND "libattica" "A library to access Open Collaboration Service providers" "https://kde.org"; FALSE "" "Required to access OCS providers in get hot new stuff.") # at the end, output the configuration diff --git a/docs/parley/index.docbook b/docs/parley/index.docbook index bf6732a1..5c1af888 100644 --- a/docs/parley/index.docbook +++ b/docs/parley/index.docbook @@ -75,9 +75,9 @@ limited to language learning but supports a multitude of subjects. <!--userbase-content--> <chapter id="introduction"><title>Introduction</title> -<para>&parley; is a vocabulary trainer. It helps you to memorize your vocabulary, for example when you are trying to learn a foreign language. You can create your own vocabulary collections with the words you need or select from a great variety of available <ulink url="http://userbase.kde.org/Parley#Vocabulary_Collections";>Vocabulary Collections</ulink>. There you can find collections containing language vocabulary and also anatomy, music, geography, chemistry or exam preparation. +<para>&parley; is a vocabulary trainer. It helps you to memorize your vocabulary, for example when you are trying to learn a foreign language. You can create your own vocabulary collections with the words you need or select from a great variety of available <ulink url="https://userbase.kde.org/Parley#Vocabulary_Collections";>Vocabulary Collections</ulink>. There you can find collections containing language vocabulary and also anatomy, music, geography, chemistry or exam preparation. </para> -<para>&parley; is very flexible and uses the <ulink url="http://en.wikipedia.org/wiki/Flashcard";>flash card learning approach</ulink>. It automatically keeps track of your learning progress. With &parley; you can arrange your vocabulary as you wish, you create your own lessons as needed. But unlike real flash cards you can use different learning methods with &parley;. +<para>&parley; is very flexible and uses the <ulink url="https://en.wikipedia.org/wiki/Flashcard";>flash card learning approach</ulink>. It automatically keeps track of your learning progress. With &parley; you can arrange your vocabulary as you wish, you create your own lessons as needed. But unlike real flash cards you can use different learning methods with &parley;. </para> <para>Flashcards contain expressions on the front side and their translation on the back. You start with a pile of cards. If you know the translation on a card, you can put it into a second pile of cards. If you did not remember it, you keep it in the first one to try again later. </para> @@ -1659,7 +1659,7 @@ The sound file will be saved next to the current vocabulary file in the <filenam </mediaobject> </screenshot> </para> -<para>And if these are not enough: you can click on <guilabel>Get New Themes</guilabel> to find more themes. Over time we hope that more and more themes come along. If you know how to create SVG graphics (for example with <ulink url="http://inkscape.org";><application>Inkscape</application></ulink>), you can create your own theme and share it with the world. +<para>And if these are not enough: you can click on <guilabel>Get New Themes</guilabel> to find more themes. Over time we hope that more and more themes come along. If you know how to create SVG graphics (for example with <ulink url="https://inkscape.org";><application>Inkscape</application></ulink>), you can create your own theme and share it with the world. </para> <para> <screenshot> @@ -1674,7 +1674,7 @@ The sound file will be saved next to the current vocabulary file in the <filenam </mediaobject> </screenshot> </para> -<para>Additional themes can be found on <ulink url="http://kde-look.org/index.php?xcontentmode=85";>kde-look.org </ulink> +<para>Additional themes can be found on <ulink url="https://store.kde.org/browse/cat/357/order/latest/";>store.kde.org</ulink> </para> </sect2> <sect2 id="general-tab"><title>General Tab</title> @@ -1725,11 +1725,11 @@ The sound file will be saved next to the current vocabulary file in the <filenam </chapter> <!--FIXME Parley is not available on Windows in 16.04 <chapter id="parley-on-windows"><title>Parley on Windows</title> -<para>It is possible to install Parley together with other <ulink url="http://edu.kde.org";>Educational software</ulink> on Windows systems. For further info please visit <ulink url="http://windows.kde.org";>this page</ulink>. +<para>It is possible to install Parley together with other <ulink url="https://edu.kde.org";>Educational software</ulink> on Windows systems. For further info please visit <ulink url="https://community.kde.org/Windows";>this page</ulink>. </para> <para>The steps to be followed in short: </para> -<para>Download the installer <ulink url="http://windows.kde.org/download.php";>here</ulink> +<para>Download the installer <ulink url="https://windows.kde.org/download.php";>here</ulink> </para> <para>Then follow the installation procedure like for any other Windows software. </para> @@ -1769,7 +1769,7 @@ The sound file will be saved next to the current vocabulary file in the <filenam <sect1 id="file-format"><title>File format</title> <para>If you are interested in the file formats that Parley can read and stores the vocabulary collections in, visit: </para> -<para><ulink url="http://userbase.kde.org/Parley/FileFormats";>Parley File Formats on userbase.kde.org</ulink> +<para><ulink url="https://userbase.kde.org/Parley/FileFormats";>Parley File Formats on userbase.kde.org</ulink> </para> </sect1> diff --git a/plasmoid/plasma_parley.desktop b/plasmoid/plasma_parley.desktop index 6511432b..bc464433 100644 --- a/plasmoid/plasma_parley.desktop +++ b/plasmoid/plasma_parley.desktop @@ -109,7 +109,7 @@ X-KDE-PluginInfo-Author=Frederik Gladhorn [email protected] X-KDE-PluginInfo-Name=plasma_applet_parley X-KDE-PluginInfo-Version=0.1 -X-KDE-PluginInfo-Website=http://plasma.kde.org/ +X-KDE-PluginInfo-Website=https://kde.org/plasma-desktop X-KDE-PluginInfo-Category=Education X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL diff --git a/plugins/example.desktop b/plugins/example.desktop index 37a75e8f..fe91fbcc 100644 --- a/plugins/example.desktop +++ b/plugins/example.desktop @@ -99,7 +99,7 @@ X-KDE-PluginInfo-Author=Avgoustinos Kadis [email protected] X-KDE-PluginInfo-Name=parley_example_script X-KDE-PluginInfo-Version=1.1 -X-KDE-PluginInfo-Website=http://edu.kde.org/parley +X-KDE-PluginInfo-Website=https://edu.kde.org/parley X-KDE-PluginInfo-Category=examples X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true diff --git a/plugins/google_dictionary.desktop b/plugins/google_dictionary.desktop index 6447d148..1c8fe6b2 100644 --- a/plugins/google_dictionary.desktop +++ b/plugins/google_dictionary.desktop @@ -106,7 +106,7 @@ X-KDE-PluginInfo-Author=Avgoustinos Kadis [email protected] X-KDE-PluginInfo-Name=google_dict X-KDE-PluginInfo-Version=1.1 -X-KDE-PluginInfo-Website=http://www.plugin.org/ +X-KDE-PluginInfo-Website=https://edu.kde.org/parley X-KDE-PluginInfo-Category=translation # X-KDE-PluginInfo-Depends=plugin1,plugin3 X-KDE-PluginInfo-License=GPL diff --git a/plugins/google_dictionary.py b/plugins/google_dictionary.py index a50bb0b9..71491d38 100644 --- a/plugins/google_dictionary.py +++ b/plugins/google_dictionary.py @@ -13,7 +13,7 @@ socket.setdefaulttimeout(timeout) # fetches the html document for the given word and language pair def fetchData(word,from_lang,to_lang): - url = "http://translate.google.com/translate_dict"; + url = "https://translate.google.com/translate_dict"; param_word_trn = ("q",word) #set query parameter param_lang_pair = ("langpair",from_lang+"|"+to_lang) request_url = url + "?" + urllib.urlencode([param_word_trn,param_lang_pair]) diff --git a/plugins/leo-dict.desktop b/plugins/leo-dict.desktop index cc69fdab..9501887a 100644 --- a/plugins/leo-dict.desktop +++ b/plugins/leo-dict.desktop @@ -103,7 +103,7 @@ X-KDE-PluginInfo-Author=Avgoustinos Kadis [email protected] X-KDE-PluginInfo-Name=leo_dict X-KDE-PluginInfo-Version=1.1 -X-KDE-PluginInfo-Website=http://edu.kde.org/parley +X-KDE-PluginInfo-Website=https://edu.kde.org/parley X-KDE-PluginInfo-Category=translation X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true diff --git a/plugins/leo-dict.py b/plugins/leo-dict.py index 37439a2f..926ae692 100644 --- a/plugins/leo-dict.py +++ b/plugins/leo-dict.py @@ -9,16 +9,16 @@ import Parley import re #german to french (Glas) [links off] -#http://dict.leo.org/frde?lp=frde&lang=de&searchLoc=1&cmpType=relaxed§Hdr=on&spellToler=on&chinese=both&pinyin=diacritic&search=Glas&relink=off +#https://dict.leo.org/frde?lp=frde&lang=de&searchLoc=1&cmpType=relaxed§Hdr=on&spellToler=on&chinese=both&pinyin=diacritic&search=Glas&relink=off #german to spanish (Glas) -#http://dict.leo.org/esde?lp=esde&lang=de&searchLoc=1&cmpType=relaxed§Hdr=on&spellToler=std&chinese=both&pinyin=diacritic&search=Glas&relink=on +#https://dict.leo.org/esde?lp=esde&lang=de&searchLoc=1&cmpType=relaxed§Hdr=on&spellToler=std&chinese=both&pinyin=diacritic&search=Glas&relink=on #spanish to german (tarro) -#http://dict.leo.org/esde?lp=esde&lang=de&searchLoc=-1&cmpType=relaxed§Hdr=on&spellToler=std&chinese=both&pinyin=diacritic&search=tarro&relink=on +#https://dict.leo.org/esde?lp=esde&lang=de&searchLoc=-1&cmpType=relaxed§Hdr=on&spellToler=std&chinese=both&pinyin=diacritic&search=tarro&relink=on #spanish to german (tarro) [links off] -#http://dict.leo.org/esde?lp=esde&lang=de&searchLoc=-1&cmpType=relaxed§Hdr=on&spellToler=std&chinese=both&pinyin=diacritic&search=tarro&relink=off +#https://dict.leo.org/esde?lp=esde&lang=de&searchLoc=-1&cmpType=relaxed§Hdr=on&spellToler=std&chinese=both&pinyin=diacritic&search=tarro&relink=off # timeout of search (important for slow connections, not to freeze Parley by waiting for a result) timeout = 1.0 @@ -42,7 +42,7 @@ def fetchData(word,from_lang,to_lang): locale = languageString(from_lang,to_lang) if locale == None: return #not supported languages - url = "http://dict.leo.org/"+locale + url = "https://dict.leo.org/"+locale #esde?lp=esde&lang=de&searchLoc=-1&cmpType=relaxed§Hdr=on&spellToler=std&chinese=both&pinyin=diacritic&search=tarro&relink=off params = [("lp",locale),("lang","de"),("searchLoc",searchLoc(from_lang,to_lang)),("cmpType","relaxed"),("sectHdr","on"),("spellToler","std"),("chinese","both"),("pinyin","diacritic"),("search",word),("relink","off")] diff --git a/plugins/test.desktop b/plugins/test.desktop index 12a00904..922f663d 100644 --- a/plugins/test.desktop +++ b/plugins/test.desktop @@ -99,7 +99,7 @@ X-KDE-PluginInfo-Author=Parley Developer [email protected] X-KDE-PluginInfo-Name=script_test X-KDE-PluginInfo-Version=1.1 -X-KDE-PluginInfo-Website=http://www.plugin.org/ +X-KDE-PluginInfo-Website=https://edu.kde.org/parley X-KDE-PluginInfo-Category=Test # X-KDE-PluginInfo-Depends=plugin1,plugin3 X-KDE-PluginInfo-License=GPL diff --git a/plugins/wiktionary/wiktionary_sound.desktop b/plugins/wiktionary/wiktionary_sound.desktop index 1e5aebc3..47ef7915 100644 --- a/plugins/wiktionary/wiktionary_sound.desktop +++ b/plugins/wiktionary/wiktionary_sound.desktop @@ -47,7 +47,7 @@ Name[uk]=Звук з Вікісловника Name[x-test]=xxWiktionary Soundxx Name[zh_CN]=Wiktionary 声音 Name[zh_TW]=Wiktionary 音效 -Comment=This script fetches sound files from http://commons.wikimedia.org. +Comment=This script fetches sound files from https://commons.wikimedia.org. Comment[bs]=Ova skripta dohvaća zvučne datoteke iz http://commons.wikimedia.org. Comment[ca]=Aquest script recupera fitxers de so des de http://commons.wikimedia.org. Comment[ca@valencia]=Aquest script recupera fitxers de so des de http://commons.wikimedia.org. @@ -96,7 +96,7 @@ X-KDE-PluginInfo-Author=Frederik Gladhorn, Thomas Eitzenberger [email protected] X-KDE-PluginInfo-Name=wiktionary_sound X-KDE-PluginInfo-Version=0.1 -X-KDE-PluginInfo-Website=http://edu.kde.org/parley +X-KDE-PluginInfo-Website=https://edu.kde.org/parley X-KDE-PluginInfo-Category=Sound X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true diff --git a/scripts_test/google_translation.py b/scripts_test/google_translation.py index 37e9f23a..d127a78a 100644 --- a/scripts_test/google_translation.py +++ b/scripts_test/google_translation.py @@ -4,7 +4,7 @@ from sgmllib import SGMLParser # fetches the html document for the given word and language pair def fetchData(word,from_lang,to_lang): - url = "http://translate.google.com/translate_dict"; + url = "https://translate.google.com/translate_dict"; param_word_trn = ("q",word) #set query parameter param_lang_pair = ("langpair",from_lang+"|"+to_lang) request_url = url + "?" + urllib.urlencode([param_word_trn,param_lang_pair]) diff --git a/scripts_test/myscript.py b/scripts_test/myscript.py index d5a0bb67..8e84009e 100644 --- a/scripts_test/myscript.py +++ b/scripts_test/myscript.py @@ -4,9 +4,9 @@ import re from sgmllib import SGMLParser -url = "http://translate.google.com/translate_dict"; -google_url = "http://ajax.googleapis.com/ajax/services/language/translate"; -referer_url = "http://edu.kde.org/parley/"; +url = "https://translate.google.com/translate_dict"; +google_url = "https://ajax.googleapis.com/ajax/services/language/translate"; +referer_url = "https://edu.kde.org/parley/"; referer = "Referer: "+referer_url header_referer = ("Referer",referer_url) param_lang_pair = ("langpair","en|fr") diff --git a/src/settings/parley.kcfg b/src/settings/parley.kcfg index e3906834..aa19ab36 100644 --- a/src/settings/parley.kcfg +++ b/src/settings/parley.kcfg @@ -385,7 +385,7 @@ <group name="KNewStuff"> <entry name="ProvidersUrl" type="Path"> <label>The Providers path for Parley</label> - <default>"http://edu.kde.org/parley/providers.xml";</default> + <default>"https://edu.kde.org/parley/newstuff/providers.xml";</default> </entry> <entry name="InstallationCommand" type="String"> <label>The command used to start a downloaded vocabulary</label> diff --git a/tipofday/tips b/tipofday/tips index ecf4e91e..c6ba71c4 100644 --- a/tipofday/tips +++ b/tipofday/tips @@ -69,6 +69,6 @@ <tip category="Parley"> <html> <p>You can use the "Download New Vocabulary" dialog or visit the website listing many vocabulary documents: -<a href="http://edu.kde.org/contrib/kvtml2.php";>http://edu.kde.org/contrib/kvtml2.php</a>.</p> +<a href="https://edu.kde.org/contrib/kvtml2.php";>https://edu.kde.org/contrib/kvtml2.php</a>.</p> </html> </tip>
