@@ -128,4 +128,15 @@ export default {
align-items: center;
display: flex !important;
}
+
+.layout {
+ display: grid;
+ grid-template-columns: 1fr;
+ grid-template-rows: auto auto;
+
+ @include media-breakpoint-up(md) {
+ grid-template-columns: 1fr 1fr;
+ grid-template-rows: 1fr;
+ }
+}
\ No newline at end of file
diff --git a/resources/assets/js/components/EventPage.vue b/resources/assets/js/components/EventPage.vue
index 3e7b6a6a01..bec15e7ac1 100644
--- a/resources/assets/js/components/EventPage.vue
+++ b/resources/assets/js/components/EventPage.vue
@@ -2,16 +2,12 @@
-
-
-
-
-
-
-
-
+
+
+
+
-
@@ -77,4 +73,21 @@ export default {
}
}
}
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/resources/assets/js/components/GroupDeviceRepairPodium.vue b/resources/assets/js/components/GroupDeviceRepairPodium.vue
index 564ecd33e1..90f11127ab 100644
--- a/resources/assets/js/components/GroupDeviceRepairPodium.vue
+++ b/resources/assets/js/components/GroupDeviceRepairPodium.vue
@@ -11,7 +11,7 @@
{{ device.counter }}
- {{ device.name }}
+ {{ translatedName }}
@@ -41,6 +41,11 @@ export default {
type: Number,
required: true
}
+ },
+ computed: {
+ translatedName() {
+ return this.$lang.get('strings.' + this.device.name)
+ }
}
}
diff --git a/resources/assets/js/components/GroupDevicesBreakdown.vue b/resources/assets/js/components/GroupDevicesBreakdown.vue
index 1edc403cd6..340e5dc8c5 100644
--- a/resources/assets/js/components/GroupDevicesBreakdown.vue
+++ b/resources/assets/js/components/GroupDevicesBreakdown.vue
@@ -95,17 +95,18 @@ export default {
translatedDeviceBreakdown() {
return this.$lang.get('groups.device_breakdown')
},
+ // The cluster names are translated in the en.json file, or language variant.
translatedComputerAndHomeOffice() {
- return this.$lang.get('groups.computed_and_home_office')
+ return this.$lang.get('strings.Computers and Home Office')
},
translatedElectronicGadget() {
- return this.$lang.get('groups.electronic_gadget')
+ return this.$lang.get('strings.Electronic Gadgets')
},
translatedHomeEntertainment() {
- return this.$lang.get('groups.home_entertainment')
+ return this.$lang.get('strings.Home Entertainment')
},
translatedKitchenAndHouseholdItems() {
- return this.$lang.get('groups.kitchen_and_household_items')
+ return this.$lang.get('strings.Kitchen and Household Items')
},
translatedNoUnpoweredStats() {
return this.$lang.get('groups.no_unpowered_stats')
@@ -131,4 +132,9 @@ export default {
text-transform: uppercase;
font-size: 18px;
}
+
+// Some cluster names are a bit long in English, so make more space.
+/deep/ .ourtabs .nav-link {
+ padding-left: calc(5% + 1px) !important;
+}
\ No newline at end of file
diff --git a/resources/assets/js/components/GroupDevicesBreakdownCluster.vue b/resources/assets/js/components/GroupDevicesBreakdownCluster.vue
index 4fa346ce0f..06e66d6a68 100644
--- a/resources/assets/js/components/GroupDevicesBreakdownCluster.vue
+++ b/resources/assets/js/components/GroupDevicesBreakdownCluster.vue
@@ -9,11 +9,11 @@
-
+
-
+
-
+
@@ -30,6 +30,14 @@ export default {
methods: {
pc(val) {
return this.stats.total ? (Math.round(10000 * val / this.stats.total) / 100) : 0
+ },
+ translate(category) {
+ // Need to translate categories. Might be null if there were no items.
+ if (category === null) {
+ return ''
+ } else {
+ return this.$lang.get('strings.' + category)
+ }
}
}
}
diff --git a/resources/assets/sass/_global.scss b/resources/assets/sass/_global.scss
index e60b093008..b6d4498a9d 100644
--- a/resources/assets/sass/_global.scss
+++ b/resources/assets/sass/_global.scss
@@ -339,7 +339,6 @@ table th {
}
.text-muted {
- font-size: 13px;
color: #5A5A5A;
}
diff --git a/resources/lang/en.json b/resources/lang/en.json
index 97d58d54e1..b5e3b45020 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -10,7 +10,6 @@
"Using a multimeter": "Using a multimeter",
"Laptop disassembly": "Laptop disassembly",
"Replacing PCB components": "Replacing PCB components",
- "Headphones": "Headphones",
"Electronics safety": "Electronics safety",
"Replacing screens": "Replacing screens",
"First aid": "First aid",
@@ -23,5 +22,49 @@
"Spare parts too expensive":"Spare parts too expensive",
"No way to open the product":"No way to open the product",
"Repair information not available":"Repair information not available",
- "Lack of equipment":"Lack of equipment"
+ "Lack of equipment": "Lack of equipment",
+ "Computers and Home Office": "Computers and Home Office",
+ "Electronic Gadgets": "Electronic Gadgets",
+ "Home Entertainment": "Home Entertainment",
+ "Kitchen and Household Items": "Kitchen and Household Items",
+ "Non-Powered Items": "Non-Powered Items",
+ "Desktop computer": "Desktop computer",
+ "Flat screen 15-17\"": "Flat screen 15-17",
+ "Flat screen 19-20\"": "Flat screen 19-20",
+ "Flat screen 22-24\"": "Flat screen 22-24",
+ "Laptop large": "Laptop large",
+ "Laptop medium": "Laptop medium",
+ "Laptop small": "Laptop small",
+ "Paper shredder": "Paper shredder",
+ "PC Accessory": "PC Accessory",
+ "Printer/scanner": "Printer/scanner",
+ "Digital Compact Camera": "Digital Compact Camera",
+ "DLSR / Video Camera": "DLSR / Video Camera",
+ "Handheld entertainment device": "Handheld entertainment device",
+ "Headphones": "Headphones",
+ "Mobile": "Mobile",
+ "Tablet": "Tablet",
+ "Flat screen 26-30\"": "Flat screen 26-30",
+ "Flat screen 32-37\"": "Flat screen 32-37",
+ "Hi-Fi integrated": "Hi-Fi integrated",
+ "Hi-Fi separates": "Hi-Fi separates",
+ "Musical instrument": "Musical instrument",
+ "Portable radio": "Portable radio",
+ "Projector": "Projector",
+ "TV and gaming-related accessories": "TV and gaming-related accessories",
+ "Aircon/Dehumidifier": "Aircon/Dehumidifier",
+ "Decorative or safety lights": "Decorative or safety lights",
+ "Fan": "Fan",
+ "Hair & Beauty item": "Hair & Beauty item",
+ "Kettle": "Kettle",
+ "Lamp": "Lamp",
+ "Power tool": "Power tool",
+ "Small kitchen item": "Small kitchen item",
+ "Toaster": "Toaster",
+ "Toy": "Toy",
+ "Vacuum": "Vacuum",
+ "Furniture": "Furniture",
+ "Bicycle": "Bicycle",
+ "Clothing/textile": "Clothing/textile",
+ "Misc": "Misc"
}
diff --git a/resources/lang/en/groups.php b/resources/lang/en/groups.php
index 5734ff4014..d4046beaf1 100644
--- a/resources/lang/en/groups.php
+++ b/resources/lang/en/groups.php
@@ -150,9 +150,5 @@
'fixed_items' => 'Fixed items',
'repairable_items' => 'Repairable items',
'end_of_life_items' => 'End-of-life items',
- 'computed_and_home_office' => 'Computer & Home Office',
- 'electronic_gadget' => 'Electronic Gadgets',
- 'home_entertainment' => 'Home Entertainment',
- 'kitchen_and_household_items' => 'Kitchen & Household Items',
'no_unpowered_stats' => 'At the moment, these stats are only displayed for powered items. We hope to include unpowered items soon.'
);
diff --git a/resources/lang/fr-BE.json b/resources/lang/fr-BE.json
index ed18b98327..116270b406 100644
--- a/resources/lang/fr-BE.json
+++ b/resources/lang/fr-BE.json
@@ -33,5 +33,49 @@
"Repair information not available": "Informations de réparation non disponibles",
"Restarter": "Réparateur",
"Spare parts not available": "Pièces détachées non disponibles",
- "Spare parts too expensive": "Pièces détachées trop coûteuses"
+ "Spare parts too expensive": "Pièces détachées trop coûteuses",
+ "Computers and Home Office": "Ordinateurs et appareils de bureau",
+ "Electronic Gadgets": "Gadgets électroniques",
+ "Home Entertainment": "Divertissement domestique",
+ "Kitchen and Household Items": "Objets de cuisine et de ménage",
+ "Non-Powered Items": "Non-Powered Items",
+ "Desktop computer": "Ordinateur de bureau",
+ "Flat screen 15-17\"": "Ecran plat 15-17",
+ "Flat screen 19-20\"": "Ecran plat 19-20",
+ "Flat screen 22-24\"": "Ecran plat 22-24",
+ "Laptop large": "Ordinateur portable grand",
+ "Laptop medium": "Ordinateur portable moyen",
+ "Laptop small": "Ordinateur portable petit",
+ "Paper shredder": "Déchiqueteuse de papier",
+ "PC Accessory": "Accessoires PC",
+ "Printer/scanner": "Imprimante/scanner",
+ "Digital Compact Camera": "Appareil photo digital compact",
+ "DLSR / Video Camera": "Appareil photo numérique/Reflex",
+ "Handheld entertainment device": "Appareil de divertissement portable",
+ "Headphones": "Ecouteurs/casque audio",
+ "Mobile": "Téléphone portable",
+ "Tablet": "Tablette",
+ "Flat screen 26-30\"": "Ecran plat 26-30",
+ "Flat screen 32-37\"": "Ecran plat 32-37",
+ "Hi-Fi integrated": "Enceintes Hifi intégrées",
+ "Hi-Fi separates": "Enceintes Hifi séparées",
+ "Musical instrument": "Instrument musical",
+ "Portable radio": "Radio portable",
+ "Projector": "Projecteur",
+ "TV and gaming-related accessories": "Accessoires TV et jeux vidéos",
+ "Aircon/Dehumidifier": "Air conditionné/déshumidificateur",
+ "Decorative or safety lights": "Lumières décoratives/éclairage",
+ "Fan": "Ventilateur",
+ "Hair & Beauty item": "Accessoires de beauté et pour cheveux",
+ "Kettle": "Bouilloire",
+ "Lamp": "Lampe",
+ "Power tool": "Outil électrique",
+ "Small kitchen item": "Petit objet de cuisine",
+ "Toaster": "Grille-pain",
+ "Toy": "Jouet",
+ "Vacuum": "Aspirateur",
+ "Furniture": "Furniture",
+ "Bicycle": "Bicycle",
+ "Clothing/textile": "Clothing/textile",
+ "Misc": "Divers"
}
\ No newline at end of file
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 0f8db7ce63..0267489937 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -10,7 +10,6 @@
"Using a multimeter": "Utiliser un multimètre",
"Laptop disassembly": "Démontage d'ordinateur portable",
"Replacing PCB components": "Remplacer des composants PCB",
- "Headphones": "Ecouteurs",
"Electronics safety": "Sécurité électronique",
"Replacing screens": "Remplacer des écrans",
"First aid": "Premiers secours",
@@ -26,5 +25,49 @@
"Remember Me": "Se rappeler de moi",
"Reset Password": "Réinitialiser mot de passe",
"Send Password Reset Link": "Envoyer lien de réinitialisation de mot de passe",
- "Whoops!": "Oups!"
+ "Whoops!": "Oups!",
+ "Computers and Home Office": "Ordinateurs et appareils de bureau",
+ "Electronic Gadgets": "Gadgets électroniques",
+ "Home Entertainment": "Divertissement domestique",
+ "Kitchen and Household Items": "Objets de cuisine et de ménage",
+ "Non-Powered Items": "Non-Powered Items",
+ "Desktop computer": "Ordinateur de bureau",
+ "Flat screen 15-17\"": "Ecran plat 15-17",
+ "Flat screen 19-20\"": "Ecran plat 19-20",
+ "Flat screen 22-24\"": "Ecran plat 22-24",
+ "Laptop large": "Ordinateur portable grand",
+ "Laptop medium": "Ordinateur portable moyen",
+ "Laptop small": "Ordinateur portable petit",
+ "Paper shredder": "Déchiqueteuse de papier",
+ "PC Accessory": "Accessoires PC",
+ "Printer/scanner": "Imprimante/scanner",
+ "Digital Compact Camera": "Appareil photo digital compact",
+ "DLSR / Video Camera": "Appareil photo numérique/Reflex",
+ "Handheld entertainment device": "Appareil de divertissement portable",
+ "Headphones": "Ecouteurs/casque audio",
+ "Mobile": "Téléphone portable",
+ "Tablet": "Tablette",
+ "Flat screen 26-30\"": "Ecran plat 26-30",
+ "Flat screen 32-37\"": "Ecran plat 32-37",
+ "Hi-Fi integrated": "Enceintes Hifi intégrées",
+ "Hi-Fi separates": "Enceintes Hifi séparées",
+ "Musical instrument": "Instrument musical",
+ "Portable radio": "Radio portable",
+ "Projector": "Projecteur",
+ "TV and gaming-related accessories": "Accessoires TV et jeux vidéos",
+ "Aircon/Dehumidifier": "Air conditionné/déshumidificateur",
+ "Decorative or safety lights": "Lumières décoratives/éclairage",
+ "Fan": "Ventilateur",
+ "Hair & Beauty item": "Accessoires de beauté et pour cheveux",
+ "Kettle": "Bouilloire",
+ "Lamp": "Lampe",
+ "Power tool": "Outil électrique",
+ "Small kitchen item": "Petit objet de cuisine",
+ "Toaster": "Grille-pain",
+ "Toy": "Jouet",
+ "Vacuum": "Aspirateur",
+ "Furniture": "Furniture",
+ "Bicycle": "Bicycle",
+ "Clothing/textile": "Clothing/textile",
+ "Misc": "Divers"
}
\ No newline at end of file
diff --git a/resources/views/category/index.blade.php b/resources/views/category/index.blade.php
index 4088ec1ba6..c548c56a52 100644
--- a/resources/views/category/index.blade.php
+++ b/resources/views/category/index.blade.php
@@ -53,10 +53,10 @@
@if(isset($list))
@foreach($list as $p)
- {{{ $p->name }}} |
+ @lang($p->name) |
@if( !empty($p->cluster) )
@foreach($categories as $cluster)
- {!! $cluster->idclusters == $p->cluster ? ''.$cluster->name.' | ' : '' !!}
+ {!! $cluster->idclusters == $p->cluster ? ''.__($cluster->name).' | ' : '' !!}
@endforeach
@else
N/A |
diff --git a/resources/views/fixometer/create.blade.php b/resources/views/fixometer/create.blade.php
index b900dddab8..aaa7047f37 100644
--- a/resources/views/fixometer/create.blade.php
+++ b/resources/views/fixometer/create.blade.php
@@ -42,7 +42,7 @@
@if(isset($categories))
-
+
@endif
diff --git a/resources/views/fixometer/device-row-with-edit.blade.php b/resources/views/fixometer/device-row-with-edit.blade.php
index f5b75bf860..ee5b53588b 100644
--- a/resources/views/fixometer/device-row-with-edit.blade.php
+++ b/resources/views/fixometer/device-row-with-edit.blade.php
@@ -9,7 +9,7 @@
- {{{ $device->deviceCategory->name }}}
+ @lang($device->deviceCategory->name)
|
@if ($powered)
diff --git a/resources/views/fixometer/edit.blade.php b/resources/views/fixometer/edit.blade.php
index e2cf119c56..23de183973 100644
--- a/resources/views/fixometer/edit.blade.php
+++ b/resources/views/fixometer/edit.blade.php
@@ -67,7 +67,7 @@
@if(isset($categories))
-
+
@endif
diff --git a/resources/views/fixometer/index.blade.php b/resources/views/fixometer/index.blade.php
index 9b76a7f739..05379ffb21 100644
--- a/resources/views/fixometer/index.blade.php
+++ b/resources/views/fixometer/index.blade.php
@@ -117,22 +117,22 @@
|