Skip to content
Snippets Groups Projects
Commit 9b989d8d authored by mathias.chouet's avatar mathias.chouet
Browse files

Work on #436 - cordova: add debug messages to updates lookup

move icon files into right folder
fix language code detection for more than 2 letters codes
parent 0764c538
No related branches found
No related tags found
1 merge request!82Resolve "Ajout de la fonctionnalité "Respect des critères""
Pipeline #138282 passed
......@@ -55,11 +55,12 @@ export class I18nService extends Observable implements Observer {
/**
* Defines the current language code from its ISO 639-1 code (2 characters) or locale code
* (ex: "fr", "en", "fr_FR", "en-US")
* @see this.languageCodeFromLocaleCode()
*
* @param code ISO 639-1 language code
*/
public setLanguage(code: string) {
// ensure 2-letter language code
code = code.substring(0, 2);
// is language supported ?
if (! Object.keys(this._availableLanguages).includes(code)) {
throw new Error(`LANGUAGE_UNSUPPORTED "${code}"`);
......
File moved
File moved
File moved
......@@ -6,11 +6,11 @@
<meta charset="utf-8">
<title>Cassiopée</title>
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="512x512" href="/android-chrome-512x512.png">
<link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="apple-touch-icon" sizes="180x180" href="assets/icons/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="512x512" href="assets/icons/android-chrome-512x512.png">
<link rel="icon" type="image/png" sizes="192x192" href="assets/icons/android-chrome-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="assets/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="assets/icons/favicon-16x16.png">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#ffffff">
<meta name="viewport" content="width=device-width, initial-scale=1">
......@@ -231,6 +231,7 @@
* at the root of the directory (ex: "fr.irstea.cassiopee_4.5.0_amd64.deb")
*/
const lookForUpdates = function() {
console.log("looking for updates");
// Web update resources root directory
const URL = "https://cassiopee.g-eau.fr/cassiopee-releases/";
......@@ -238,6 +239,7 @@
let version = "4.4.2"; // debug
cordova.getAppVersion.getVersionNumber((versionNumber) => {
version = versionNumber;
console.log("current version", version);
// fetch releases information
const options = {
method: 'get',
......@@ -246,6 +248,7 @@
cordova.plugin.http.sendRequest(URL + "releases.json", options, (response) => {
var data = JSON.parse(response.data); // This is the resultant JSON in useful form
// alert(`Youpi ! ${response.status} version=${version}, latest=${data.latest}, comp=${semverCompare(data.latest, version)}`);
console.log("latest version", data !== undefined ? data.latest : "err");
// compare current version to latest version
if (data.latest && semverCompare(data.latest, version) == 1) {
// get download link for latest version, depending on platform
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment