Commit a028a8c6 authored by David's avatar David

Suppression de EnergyTheoretical1l1deg et fin d'ajout de la langue Persan

parent 2c1ef84f
......@@ -117,11 +117,6 @@ Thank you for your contribution') ?>
<div class="blocs infos" id="BlocData">
<h2 class="titre data"><?= _('Data') ?> :</h2>
<div class="form EnergyTheoretical1l1deg">
<label><?= _('Energy required to raise 1L of water by 1°C') ?> :</label>
<input class="shared" id="EnergyTheoretical1l1deg" name="EnergyTheoretical1l1deg" type="number" step="0.001" min="0" max="99" style="width: 100px;" value="<?php echo valeurRecup('EnergyTheoretical1l1deg'); ?>" />Wh
</div>
<div class="form YieldInstallHotWater">
<label><?= _('Water heater efficiency (heat losses)') ?> : </label>
......@@ -774,7 +769,7 @@ function calcWattPerShower() {
$( "#WattPerShower" ).text(resultWattPerShower.toFixed(2));
}
function calcEnergyTheoretical1l1degForShower() {
var resultEnergyTheoretical1l1degForShower=parseFloat($( "#EnergyTheoretical1l1deg" ).val()) * (100 - parseFloat($( "#YieldInstallHotWater" ).val())) / 100 + parseFloat($( "#EnergyTheoretical1l1deg" ).val());
var resultEnergyTheoretical1l1degForShower=parseFloat(1.162) * (100 - parseFloat($( "#YieldInstallHotWater" ).val())) / 100 + parseFloat(1.162);
$( "#EnergyTheoretical1l1degForShower" ).text(resultEnergyTheoretical1l1degForShower.toFixed(2));
}
function calcCostWaterPerShower() {
......
......@@ -2,6 +2,8 @@
Tool to calculate the gain of a showerloop (shower with water recycling) compared to a conventional shower (in energy, water, money ...)
**The project / calculator is accessible at: http://showerloopcalculator.zici.fr/**
This calculator is based on the hardware and open source project: http://showerloop.org/
### Installing the tool on my site:
......
[general]
; Country name
name="Iran"
; ISO 3166 Country Codes : https://dev.maxmind.com/geoip/legacy/codes/iso3166/
code="IR"
; Country currency
currency="IRR"
; Note: for numbers use "," and not "."
; Default value of the form
[form]
; Water price
WaterCostShop=14000
; Wastewater price
CleanWaterCost=5355000
; Cold water supply temperature
WaterTemp=15
; Number of users
NbPeaple=3
; Number of showers per person per week
NbShowerPerPeaplePerWeek=4
; Average time spent under the shower per person
ShowerTimePerPeaple=10
; Average showering water temperature
ShowerTemp=37.5
; Flow rate of your shower
ShowerFlow=10
; Default hot water system (same name as [energy])
HotWaterSystem="naturalGas"
[energy]
; Source : http://www.bretagne-energie.fr/actualites/argus-des-energies/ https://elyotherm.fr/comparatif-cout-energies-kwh
wood[name]="چوب"
wood[price]=385000
naturalGas[name]="گازطبیعی"
naturalGas[price]=1500
heatingOil[name]="فسیلی"
heatingOil[price]=29000
electric[name]="برق"
electric[price]=1000
......@@ -12,8 +12,6 @@ currency="&#36;"
[form]
; Verbose level (1, 2, 3)
Verbose=2
; Energy required to raise 1L of water by 1°C
EnergyTheoretical1l1deg=1.162
; Water price
WaterCostShop=2.03
; Wastewater price
......
......@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: showerloopcalculator\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-24 00:15+0200\n"
"PO-Revision-Date: 2018-10-24 12:51\n"
"PO-Revision-Date: 2018-10-26 11:32\n"
"Last-Translator: kepon85 <david@mercereau.info>\n"
"Language-Team: Persian\n"
"Language: fa_IR\n"
......@@ -114,11 +114,11 @@ msgstr "دمای آب سرد"
#: Calculator.php:141
msgid "Water price"
msgstr "هزینه آب"
msgstr "قیمت آب"
#: Calculator.php:146
msgid "Wastewater price"
msgstr "هزینه فاظلاب"
msgstr "قیمت فاظلاب"
#: Calculator.php:150
msgid "Water total cost :"
......@@ -134,7 +134,7 @@ msgstr "تعداد افراد خانواده"
#: Calculator.php:164
msgid "Number of showers per person per week"
msgstr "تعداد دوش ها به ازای هر نفر هر هفته"
msgstr "تعداد دوش گرفتن به ازای هر نفر هر هفته"
#: Calculator.php:169
msgid "Average time spent under the shower per person"
......@@ -142,7 +142,7 @@ msgstr "میانگین زمان صرف شده در حمام به ازای هر
#: Calculator.php:174
msgid "Average showering water temperature"
msgstr "میانگین دما دوش گرفتن"
msgstr "میانگین دمای دوش آب"
#: Calculator.php:179
msgid "You're current water heating system : "
......@@ -150,7 +150,7 @@ msgstr "سیستم گرمایشی آب فعلی شما : "
#: Calculator.php:198
msgid "The cost of this energy is"
msgstr "هزینه این انرژی"
msgstr "هزینه این انرژی برابر است با"
#: Calculator.php:203
msgid "With your current shower"
......@@ -158,7 +158,7 @@ msgstr "دوش فعلی شما"
#: Calculator.php:206
msgid "Flow rate of your shower :"
msgstr "میزان جریان دوش شما:"
msgstr "میزان جریان آب دوش شما :"
#: Calculator.php:212
msgid "How to measure how much water flows from your shower every minute."
......
Name,Languages,"Translated (Words)","Target Words","Approved (Words)","Votes Made"
"Amirhossein yousefi (amir.sara)",Persian,965,1076,965,0
"Amirhossein yousefi (amir.sara)",Persian,965,1080,965,0
"DavidM (kepon85)",,0,0,0,0
Nibor44,,0,0,0,0
"Tatjana Larina (erikaflynn) (t257233)",,0,0,0,0
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