From 1f7aa64ee78090319e06e0c9a4c2da0dd136a115 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Fri, 8 Sep 2023 11:10:34 +0300 Subject: [PATCH] welsh translations --- model_data/epc_attributes/FloorAttributes.py | 1 + .../epc_attributes/HotWaterAttributes.py | 3 +- .../epc_attributes/MainheatAttributes.py | 2 + .../MainheatControlAttributes.py | 3 +- .../test_data/test_floor_attributes_cases.py | 7 +++- .../test_hot_water_attributes_cases.py | 4 ++ .../test_mainheat_attributes_cases.py | 39 ++++++++++++++++++- .../test_mainheat_control_attributes_cases.py | 5 ++- 8 files changed, 58 insertions(+), 6 deletions(-) diff --git a/model_data/epc_attributes/FloorAttributes.py b/model_data/epc_attributes/FloorAttributes.py index 938c3a22..33299ccf 100644 --- a/model_data/epc_attributes/FloorAttributes.py +++ b/model_data/epc_attributes/FloorAttributes.py @@ -16,6 +16,7 @@ class FloorAttributes(Definitions): "(anheddiad arall islaw)": "(another dwelling below)", "solet, dim inswleiddio (rhagdybiaeth)": "solid, no insulation (assumed)", "crog, dim inswleiddio (rhagdybiaeth)": "suspended, no insulation (assumed)", + "(eiddo arall islaw)": "(other premises below)" } def __init__(self, description: str): diff --git a/model_data/epc_attributes/HotWaterAttributes.py b/model_data/epc_attributes/HotWaterAttributes.py index b2fd3856..8d118751 100644 --- a/model_data/epc_attributes/HotWaterAttributes.py +++ b/model_data/epc_attributes/HotWaterAttributes.py @@ -97,7 +97,8 @@ class HotWaterAttributes(Definitions): "ogçör brif system": "from main system", "ogçör brif system, adfer gwres nwyon ffliw": "from main system, flue gas heat recovery", "bwyler/cylchredydd nwy": "gas boiler/circulator", - "ogçör brif system, dim thermostat ar y silindr": "from main system, no cylinder thermostat" + "ogçör brif system, dim thermostat ar y silindr": "from main system, no cylinder thermostat", + "twymwr tanddwr, an-frig": "electric immersion, off-peak" } def __init__(self, description: str): diff --git a/model_data/epc_attributes/MainheatAttributes.py b/model_data/epc_attributes/MainheatAttributes.py index 9ea51dea..119c029e 100644 --- a/model_data/epc_attributes/MainheatAttributes.py +++ b/model_data/epc_attributes/MainheatAttributes.py @@ -23,6 +23,8 @@ class MainHeatAttributes(Definitions): WELSH_TEXT = { "bwyler a rheiddiaduron, nwy prif gyflenwad": "boiler and radiators, mains gas", + "st+¦r wresogyddion trydan": "electric storage heaters", + "bwyler a rheiddiaduron, olew": "boiler and radiators, oil" } REMAP = { diff --git a/model_data/epc_attributes/MainheatControlAttributes.py b/model_data/epc_attributes/MainheatControlAttributes.py index 0ad2cada..6d47d3a8 100644 --- a/model_data/epc_attributes/MainheatControlAttributes.py +++ b/model_data/epc_attributes/MainheatControlAttributes.py @@ -75,7 +75,8 @@ class MainheatControlAttributes(Definitions): WELSH_TEXT = { "rhaglennydd, dim thermostat ystafell": "programmer, no room thermostat", - "rhaglennydd a thermostat ystafell": "programmer and room thermostat" + "rhaglennydd a thermostat ystafell": "programmer and room thermostat", + "rheoligçör t+ól +ó llaw": "manual charge control", } def __init__(self, description: str): diff --git a/model_data/tests/test_data/test_floor_attributes_cases.py b/model_data/tests/test_data/test_floor_attributes_cases.py index 89abf198..40f13e34 100644 --- a/model_data/tests/test_data/test_floor_attributes_cases.py +++ b/model_data/tests/test_data/test_floor_attributes_cases.py @@ -341,5 +341,10 @@ clean_floor_cases = [ "another_property_below": False}, {'original_description': 'To unheated space, no insulation (assumed)', 'thermal_transmittance': None, 'thermal_transmittance_unit': None, 'is_assumed': True, 'is_to_unheated_space': True, 'is_to_external_air': False, - 'is_suspended': False, 'is_solid': False, 'insulation_thickness': 'none', "another_property_below": False} + 'is_suspended': False, 'is_solid': False, 'insulation_thickness': 'none', "another_property_below": False}, + {'original_description': '(eiddo arall islaw)', 'thermal_transmittance': None, + 'thermal_transmittance_unit': None, + 'is_assumed': False, 'is_to_unheated_space': False, 'is_to_external_air': False, 'is_suspended': False, + 'is_solid': False, 'insulation_thickness': None, + "another_property_below": True} ] diff --git a/model_data/tests/test_data/test_hot_water_attributes_cases.py b/model_data/tests/test_data/test_hot_water_attributes_cases.py index 8e0ede98..8e7592b9 100644 --- a/model_data/tests/test_data/test_hot_water_attributes_cases.py +++ b/model_data/tests/test_data/test_hot_water_attributes_cases.py @@ -142,4 +142,8 @@ hotwater_cases = [ 'system_type': 'from main system', 'thermostat_characteristics': 'no cylinder thermostat', 'heating_scope': None, 'energy_recovery': None, 'tariff_type': None, 'extra_features': None, 'chp_systems': None, 'distribution_system': None, 'no_system_present': None, 'assumed': False, "appliance": None}, + {'original_description': 'Twymwr tanddwr, an-frig', 'heater_type': 'electric immersion', 'system_type': None, + 'thermostat_characteristics': None, 'heating_scope': None, 'energy_recovery': None, 'tariff_type': 'off-peak', + 'extra_features': None, 'chp_systems': None, 'distribution_system': None, 'no_system_present': None, + 'assumed': False, "appliance": None} ] diff --git a/model_data/tests/test_data/test_mainheat_attributes_cases.py b/model_data/tests/test_data/test_mainheat_attributes_cases.py index b623c4d5..df3dcdd7 100644 --- a/model_data/tests/test_data/test_mainheat_attributes_cases.py +++ b/model_data/tests/test_data/test_mainheat_attributes_cases.py @@ -1117,6 +1117,41 @@ mainheat_cases = [ 'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': True, "has_electric_heat_pumps": False, - "has_micro-cogeneration": False} - + "has_micro-cogeneration": False}, + {'original_description': 'St+¦r wresogyddion trydan', 'has_radiators': False, 'has_fan_coil_units': False, + 'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False, + 'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False, + 'has_room_heaters': False, 'has_electric_storage_heaters': True, 'has_warm_air': False, + 'has_electric_underfloor_heating': False, 'has_electric_ceiling_heating': False, 'has_community_scheme': False, + 'has_ground_source_heat_pump': False, 'has_no_system_present': False, 'has_portable_electric_heaters': False, + 'has_water_source_heat_pump': False, 'has_electric': True, 'has_mains_gas': False, 'has_wood_logs': False, + 'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False, + 'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, + 'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False, + "has_electric_heat_pumps": False, + "has_micro-cogeneration": False}, + {'original_description': 'Boiler and radiators, oil', 'has_radiators': True, 'has_fan_coil_units': False, + 'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False, + 'has_pipes_in_concrete_slab': False, 'has_boiler': True, 'has_air_source_heat_pump': False, + 'has_room_heaters': False, 'has_electric_storage_heaters': False, 'has_warm_air': False, + 'has_electric_underfloor_heating': False, 'has_electric_ceiling_heating': False, 'has_community_scheme': False, + 'has_ground_source_heat_pump': False, 'has_no_system_present': False, 'has_portable_electric_heaters': False, + 'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False, + 'has_LPG': False, 'has_coal': False, 'has_oil': True, 'has_wood_pellets': False, 'has_anthracite': False, + 'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': True, 'has_assumed': False, + 'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False, + "has_electric_heat_pumps": False, + "has_micro-cogeneration": False}, + {'original_description': 'Bwyler a rheiddiaduron, olew', 'has_radiators': True, 'has_fan_coil_units': False, + 'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False, + 'has_pipes_in_concrete_slab': False, 'has_boiler': True, 'has_air_source_heat_pump': False, + 'has_room_heaters': False, 'has_electric_storage_heaters': False, 'has_warm_air': False, + 'has_electric_underfloor_heating': False, 'has_electric_ceiling_heating': False, 'has_community_scheme': False, + 'has_ground_source_heat_pump': False, 'has_no_system_present': False, 'has_portable_electric_heaters': False, + 'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False, + 'has_LPG': False, 'has_coal': False, 'has_oil': True, 'has_wood_pellets': False, 'has_anthracite': False, + 'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': True, 'has_assumed': False, + 'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False, + "has_electric_heat_pumps": False, + "has_micro-cogeneration": False}, ] diff --git a/model_data/tests/test_data/test_mainheat_control_attributes_cases.py b/model_data/tests/test_data/test_mainheat_control_attributes_cases.py index c2f68eaa..f55d3a83 100644 --- a/model_data/tests/test_data/test_mainheat_control_attributes_cases.py +++ b/model_data/tests/test_data/test_mainheat_control_attributes_cases.py @@ -139,5 +139,8 @@ mainheat_control_cases = [ 'trvs': None}, {'original_description': 'Rhaglennydd a thermostat ystafell', 'thermostatic_control': 'room thermostat', 'charging_system': None, 'switch_system': 'programmer', 'no_control': None, 'dhw_control': None, - 'community_heating': None, 'multiple_room_thermostats': False, 'auxiliary_systems': None, 'trvs': None} + 'community_heating': None, 'multiple_room_thermostats': False, 'auxiliary_systems': None, 'trvs': None}, + {'original_description': 'RheoliGÇÖr t+ól +ó llaw', 'thermostatic_control': None, + 'charging_system': 'manual charge control', 'switch_system': None, 'no_control': None, 'dhw_control': None, + 'community_heating': None, 'multiple_room_thermostats': False, 'auxiliary_systems': None, 'trvs': None}, ]