Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 273c9df

Browse files
author
DBChoco
committedApr 25, 2022
added back calc methods for: France, Russia and Gulf Region
1 parent dd5b75a commit 273c9df

File tree

3 files changed

+36
-0
lines changed

3 files changed

+36
-0
lines changed
 

‎src/main/main.js

+25
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,31 @@ function calcPrayerTimes(date = new Date()){
460460
case "ISNA":
461461
params = adhan.CalculationMethod.NorthAmerica();
462462
break;
463+
case "France12":
464+
params = adhan.CalculationMethod.Other();
465+
params.fajrAngle = 12
466+
params.ishaAngle = 12
467+
break;
468+
case "France15":
469+
params = adhan.CalculationMethod.Other();
470+
params.fajrAngle = 15
471+
params.ishaAngle = 15
472+
break;
473+
case "France18":
474+
params = adhan.CalculationMethod.Other();
475+
params.fajrAngle = 18
476+
params.ishaAngle = 18
477+
break;
478+
case "Russia":
479+
params = adhan.CalculationMethod.Other();
480+
params.fajrAngle = 16
481+
params.ishaAngle = 15
482+
break;
483+
case "Gulf":
484+
params = adhan.CalculationMethod.Other();
485+
params.fajrAngle = 18
486+
params.ishaInterval = 90
487+
break;
463488
default:
464489
params = adhan.CalculationMethod.MuslimWorldLeague();
465490
}

‎src/settings/settings.html

+5
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,11 @@ <h1 id=settingsTitle>Settings</h1>
368368
<option id="Turkey" value="Turkey">Turkey</option>
369369
<option id="Tehran" value="Tehran">Tehran</option>
370370
<option id="ISNA" value="ISNA">ISNA</option>
371+
<option id="France12" value="France12">France 12</option>
372+
<option id="France15" value="France15">France 15</option>
373+
<option id="France18" value="France18">France 18</option>
374+
<option id="Russia" value="Russia">Russia</option>
375+
<option id="Gulf" value="Gulf">Gulf Region</option>
371376
</select> <br>
372377
</form>
373378
</div>

‎src/settings/settings.js

+6
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,12 @@ function loadLanguage(lang){
702702
document.getElementById("delayText").innerText = window.api.getLanguage(lang, "delayAfterM");
703703
document.getElementById("delayFormText").innerText = window.api.getLanguage(lang, "delayMin");
704704

705+
document.getElementById("France12").innerText = window.api.getLanguage(lang, "france") + " 12";
706+
document.getElementById("France15").innerText = window.api.getLanguage(lang, "france") + " 15";
707+
document.getElementById("France18").innerText = window.api.getLanguage(lang, "france") + " 18";
708+
document.getElementById("Russia").innerText = window.api.getLanguage(lang, "russia");
709+
document.getElementById("Gulf").innerText = window.api.getLanguage(lang, "gulf");
710+
705711
document.getElementById("adjustmentsText").innerHTML = window.api.getLanguage(lang, "adjustements");
706712
document.getElementById("adjCheckText").innerText = window.api.getLanguage(lang, "enableAdj");
707713
document.getElementById("fajrAdjText").innerText = window.api.getLanguage(lang, "fajrAdj");

0 commit comments

Comments
 (0)
Please sign in to comment.