Skip to content

Commit

Permalink
dap, eco, sf: Tweak translations
Browse files Browse the repository at this point in the history
  • Loading branch information
MattiasTF committed Feb 5, 2025
1 parent 04148be commit 8a2854d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions software/web/src/modules/day_ahead_prices/translation_en.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ let x = {
"grid_fees_plus_taxes": "Grid fees and taxes",
"surcharge": "Surcharge",
"day_ahead_prices_muted": /*FFN*/(api_url: string) => <>The data is provided by <a href="https://www.entsoe.eu/about/" target="_blank">ENTSO-E</a> and fetched from <a href={api_url}>{api_url.replace("https://", "").replace(/\/$/, "")}</a>.</>/*NF*/,
"day_ahead_prices_desc": <>Automatic download of day-ahead spot market prices. {__("The_device")} must be connected to the internet.</>,
"day_ahead_prices_desc": <>Automatic download of day-ahead spot market prices. {__("The_device")} must be connected to the Internet.</>,
"region": "Region",
"germany": "Germany",
"austria": "Austria",
"luxembourg": "Luxembourg",
"resolution": "Resolution",
"resolution_muted": "electric utility dependant",
"resolution_muted": "depends on electric utility",
"minutes15": "15 minutes",
"minutes60": "60 minutes",
"euro_divided_by_month": "€/month",
Expand All @@ -39,8 +39,8 @@ let x = {
"vat": "Value-added tax",
"vat_muted": "on market price",
"extra_costs_help": <>
<p><strong>Optional: For control, only the net day-ahead spot market price is used, extra costs are only displayed.</strong></p>
<p>The day-ahead spot price is only a part of the electricity costs. Additional fixed taxes, grid fees, and surcharges apply.</p>
<p><strong>Optional: For control, only the net day-ahead spot market price is used; extra costs are only displayed.</strong></p>
<p>The day-ahead spot price is only a part of the electricity costs. Additional fixed taxes, grid fees and surcharges apply.</p>
One of the following variants of configuring the extra cost settings is recommended:
<ul class="mb-0">
<li>Don't configure extra costs: The net spot market price is displayed.</li>
Expand Down
2 changes: 1 addition & 1 deletion software/web/src/modules/eco/translation_de.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let x = {
</>,
"yield_forecast_threshold_help": <>
<p>Gibt einen Schwellwert in Kilowattstunden an, über dem ein Ladevorgang nur bei PV-Überschuss freigegeben wird (der Ladeplan wird ignoriert).</p>
<p>Beispiel: 'Nur wenn PV-Ertragsprognose unter' ist auf <strong>75 kWh/Tag</strong> konfiguriert und die <strong>PV-Ertragsprognose für heute liegt bei 80 kWh/Tag</strong>. In diesem Fall würde der <strong>Ladeplan nicht ausgeführt</strong> und nur geladen wenn PV-Überschuss verfügbar ist.</p>
<p>Beispiel: 'Nur wenn PV-Ertragsprognose unter' ist auf <strong>75kWh/Tag</strong> konfiguriert und die <strong>PV-Ertragsprognose für heute liegt bei 80kWh/Tag</strong>. In diesem Fall würde der <strong>Ladeplan nicht ausgeführt</strong> und nur geladen wenn PV-Überschuss verfügbar ist.</p>
<p>Es wird also kein Strom eingekauft, auch nicht wenn er sehr günstig wäre, wenn bekannt ist, dass genug PV-Überschuss verfügbar sein wird.</p>
</>
},
Expand Down
16 changes: 8 additions & 8 deletions software/web/src/modules/eco/translation_en.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let x = {
"content": {
"eco": "Eco Mode",
"charge_plan_enable": "Charge planning enabled",
"charge_plan_enable_desc": "Optimizes charges for economically and ecologically. The desired departure time, dynamic tariff pricing and solar forecast are taken into account. Charge plans are used in all \"Eco\" charge modes.",
"charge_plan_enable_desc": "Optimizes charges economically and ecologically. The desired departure time, dynamic tariff pricing and solar forecast are taken into account. Charge plans are used in all \"Eco\" charge modes.",
"park_time": "Maximum parking time",
"charge_below": "Always charge when cost below",
"block_above": "Never charge when cost above",
Expand All @@ -27,25 +27,25 @@ let x = {
"active": "Active",
"inactive": "Inactive",
"solar_forecast_needs_activation": <>To be able to include the expected PV excess into the charge plan, the <a href="#solar_forecast">solar forecast</a> must be enabled.</>,
"day_ahead_prices_needs_activation": <>To be able to calculate the charge plan, the <a href="#day_ahead_prices">day ahead prices</a> must be enabled.</>,
"day_ahead_prices_needs_activation": <>To be able to calculate the charge plan, <a href="#day_ahead_prices">dynamic tariff</a> must be enabled.</>,
"charge_plan_enable_help": "When the charge plan is enabled, a configurable charge plan is shown on the status page if the charge mode is one of the \"Eco\" modes.",
"park_time_help": <>
<p>Specifies for how long in the future a charge plan will be created <strong>starting at the moment a vehicle is plugged in</strong>.</p>
<p>Example: It is 08:00, the charge plan is configured to 'Use the cheapest <b>4 hours</b> until <b>Today at 20:00</b>' and the maximum <b>parking time</b> is set to <b>8 hours</b>. The charge plan will ensure that the <b>cheapest 4 hours</b> are used <b>before the maximum parking time expires</b> (for example until 16:00 if the vehicle is plugged in at 08:00, but until 18:00 if the vehicle is plugged in at 10:00).</p>
<p>With this configuration it is possible to take for example the working hours of employees into account.</p>
<p>With this configuration, it is possible to take the working hours of employees into account, for example.</p>
</>,
"charge_below_help": <>
<p>Specifies a price in cent below which a charge will <strong>always</strong> be started, regardless of the charge plan.</p>
<p>The configured price is compared with the net spot market price excluding any fees, taxes or surcharges.</p>
<p>The configured price is compared to the net spot market price, excluding any fees, taxes or surcharges.</p>
</>,
"block_above_help": <>
<p>Specifies a price in cent above which a charge will <strong>never</strong> be started, regardless of the charge plan.</p>
<p>The configured price is compared with the net spot market price excluding any fees, taxes or surcharges.</p>
<p>The configured price is compared to the net spot market price, excluding any fees, taxes or surcharges.</p>
</>,
"yield_forecast_threshold_help": <>
<p>Specifies a threshold in kWh above which a charge will only be started if PV excess is available (the charge plan is ignored).</p>
<p>Example: 'Only if PV yield forecast below' is configured to <b>75kWh/day</b> and the <b>PV yield forecast for today is 80kWh/day</b> (above 75kWh). In this case the <b>charge plan is not executed</b> and charging is only possible if PV excess is available.</p>
<p>Thus energy is not bought (even if it would be cheap to do so) if it is known that enough PV excess will be available.</p>
<p>Example: 'Only if PV yield forecast below' is configured to <b>75 kWh/day</b> and the <b>PV yield forecast for today is 80 kWh/day</b> (above 75 kWh). In this case, the <b>charge plan is not executed</b> and charging is only possible if PV excess is available.</p>
<p>Therefore, energy is not boughteven if it would be cheap to do soif it is known that enough PV excess will be available.</p>
</>
},
"script": {
Expand All @@ -55,7 +55,7 @@ let x = {
"charge_plan": /*FFN*/(charge_plan: {departure: number, enable: boolean, time: Date, amount: number}, charger_zero_start: number, charger_zero_amount: number) => {
let day = "until today at";
if (charge_plan.departure === 1) {
day = "until tormorrow at";
day = "until tomorrow at";
} else if (charge_plan.departure === 2) {
day = "daily until";
}
Expand Down
2 changes: 1 addition & 1 deletion software/web/src/modules/solar_forecast/translation_en.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let x = {
"add_plane_config_count": /*SFN*/(x: number, max: number) => x + " of " + max + " PV planes configured"/*NF*/,
"add_plane_config_done": "All PV planes added (6 of 6)",
"edit_plane_config_title": "Edit PV plane",
"solar_forecast_desc": <>Automatic download of solar forecast data. {__("The_device")} must be connected to the internet.</>,
"solar_forecast_desc": <>Automatic download of solar forecast data. {__("The_device")} must be connected to the Internet.</>,
"table_name": "Name",
"table_azimuth": "Azimuth",
"table_declination": "Declination",
Expand Down

0 comments on commit 8a2854d

Please sign in to comment.