Skip to content

Commit

Permalink
Fixed GearView and missing i18n declaration
Browse files Browse the repository at this point in the history 
[frontend] fixed GearView on incorrect i18n declarations
[frontend] fixed missing i18n declaration on EditActivityModalComponent
  • Loading branch information
@joaovitoriasilva
joaovitoriasilva committed Aug 1, 2024
1 parent ed86435 commit c52896a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
2 changes: 2 additions & 0 deletions frontend/app/src/components/Activities/Modals/EditActivityModalComponent.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

<script>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
// Importing the utils
import { addToast } from '@/utils/toastUtils';
Expand All @@ -69,6 +70,7 @@ export default {
},
},
setup(props) {
const { t } = useI18n();
const editActivityDescription = ref(props.activity.description);
const editActivityName = ref(props.activity.name);
const editActivityType = ref(props.activity.activity_type);
Expand Down
40 changes: 20 additions & 20 deletions frontend/app/src/views/Gears/GearView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@
<!-- badges -->
<div class="hstack justify-content-center">
<span class="badge bg-success-subtle border border-success-subtle text-success-emphasis align-middle" v-if="gear?.is_active == 1">
{{ $t("gears.activeState") }}
{{ $t("gearsView.activeState") }}
</span>
<span class="badge bg-danger-subtle border border-danger-subtle text-danger-emphasis align-middle" v-else>
{{ $t("gears.inactiveState") }}
{{ $t("gearsView.inactiveState") }}
</span>
<span class="ms-2 badge bg-primary-subtle border border-primary-subtle text-primary-emphasis align-middle" v-if="gear?.gear_type == 1">
{{ $t("gears.gearTypeOption1") }}
{{ $t("gearsView.gearTypeOption1") }}
</span>
<span class="ms-2 badge bg-primary-subtle border border-primary-subtle text-primary-emphasis align-middle" v-else-if="gear?.gear_type == 2">
{{ $t("gears.gearTypeOption2") }}
{{ $t("gearsView.gearTypeOption2") }}
</span>
<span class="ms-2 badge bg-primary-subtle border border-primary-subtle text-primary-emphasis align-middle" v-else>
{{ $t("gears.gearTypeOption3") }}
{{ $t("gearsView.gearTypeOption3") }}
</span>
<span class="ms-2 badge bg-primary-subtle border border-primary-subtle text-primary-emphasis align-middle" v-if="gear?.strava_gear_id">
{{ $t("gears.gearFromStrava") }}
{{ $t("gearsView.gearFromStrava") }}
</span>
</div>
</div>
Expand All @@ -59,24 +59,24 @@
<form @submit.prevent="submitEditGearForm">
<div class="modal-body">
<!-- brand fields -->
<label for="gearBrandEdit"><b>{{ $t("gears.modalBrand") }}:</b></label>
<input class="form-control" type="text" name="gearBrandEdit" :placeholder='$t("gears.modalBrand")' v-model="brand" maxlength="250">
<label for="gearBrandEdit"><b>{{ $t("gearsView.modalBrand") }}:</b></label>
<input class="form-control" type="text" name="gearBrandEdit" :placeholder='$t("gearsView.modalBrand")' v-model="brand" maxlength="250">
<!-- model fields -->
<label for="gearModelEdit"><b>{{ $t("gears.modalModel") }}:</b></label>
<input class="form-control" type="text" name="gearModelEdit" :placeholder='$t("gears.modalModel")' v-model="model" maxlength="250">
<label for="gearModelEdit"><b>{{ $t("gearsView.modalModel") }}:</b></label>
<input class="form-control" type="text" name="gearModelEdit" :placeholder='$t("gearsView.modalModel")' v-model="model" maxlength="250">
<!-- nickname fields -->
<label for="gearNicknameEdit"><b>* {{ $t("gears.modalNickname") }}:</b></label>
<input class="form-control" type="text" name="gearNicknameEdit" :placeholder='$t("gears.modalNickname")' v-model="nickname" maxlength="250" required>
<label for="gearNicknameEdit"><b>* {{ $t("gearsView.modalNickname") }}:</b></label>
<input class="form-control" type="text" name="gearNicknameEdit" :placeholder='$t("gearsView.modalNickname")' v-model="nickname" maxlength="250" required>
<!-- gear type fields -->
<label for="gearTypeEdit"><b>* {{ $t("gears.modalGearTypeLabel") }}:</b></label>
<label for="gearTypeEdit"><b>* {{ $t("gearsView.modalGearTypeLabel") }}:</b></label>
<select class="form-control" name="gearTypeEdit" v-model="gearType" required>
<option value="1">{{ $t("gears.modalGearTypeOption1Bike") }}</option>
<option value="2">{{ $t("gears.modalGearTypeOption2Shoes") }}</option>
<option value="3">{{ $t("gears.modalGearTypeOption3Wetsuit") }}</option>
<option value="1">{{ $t("gearsView.modalGearTypeOption1Bike") }}</option>
<option value="2">{{ $t("gearsView.modalGearTypeOption2Shoes") }}</option>
<option value="3">{{ $t("gearsView.modalGearTypeOption3Wetsuit") }}</option>
</select>
<!-- date fields -->
<label for="gearDateEdit"><b>* {{ $t("gears.modalDateLabel") }}:</b></label>
<input class="form-control" type="date" name="gearDateEdit" :placeholder='$t("gears.modalDatePlaceholder")' v-model="date" required>
<label for="gearDateEdit"><b>* {{ $t("gearsView.modalDateLabel") }}:</b></label>
<input class="form-control" type="date" name="gearDateEdit" :placeholder='$t("gearsView.modalDatePlaceholder")' v-model="date" required>
<!-- gear is_active fields -->
<label for="gearIsActiveEdit"><b>* {{ $t("gearView.modalEditGearIsActiveLabel") }}:</b></label>
<select class="form-control" name="gearIsActiveEdit" v-model="isActive" required>
Expand Down Expand Up @@ -131,8 +131,8 @@
<!-- details -->
<div class="vstack align-items-center">
<span class="mt-2"><strong>{{ $t("gearView.labelDistance") }}:</strong> {{ gearDistance }} km</span>
<span class="mt-2" v-if="gear?.brand"><strong>{{ $t("gears.modalBrand") }}:</strong> {{ gear?.brand }}</span>
<span class="mt-2" v-if="gear?.model"><strong>{{ $t("gears.modalModel") }}:</strong> {{ gear?.model }}</span>
<span class="mt-2" v-if="gear?.brand"><strong>{{ $t("gearsView.modalBrand") }}:</strong> {{ gear?.brand }}</span>
<span class="mt-2" v-if="gear?.model"><strong>{{ $t("gearsView.modalModel") }}:</strong> {{ gear?.model }}</span>
</div>
</div>
</div>
Expand Down

0 comments on commit c52896a

Please sign in to comment.