IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2112-Thousand-separator-problem

Browse Source
This commit is contained in:
Alexander Friedland 2022-08-08 15:11:58 +02:00 committed by GitHub
commit dbbec33f73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/components/Contributions/ContributionForm.vue
View File

@ -13,7 +13,7 @@
</div> </div>
</div> </div>
<b-form ref="form" @submit.prevent="submit" class="border p-3"> <b-form ref="form" @submit.prevent="submit" class="border p-3">
<label>{{ $t('contribution.selectDate') }}</label> <label>{{ $t('contribution.selectDate') }} {{ $t('math.asterisk') }}</label>
<b-form-datepicker <b-form-datepicker
id="contribution-date" id="contribution-date"
v-model="form.date" v-model="form.date"
@ -31,26 +31,26 @@
</b-form-datepicker> </b-form-datepicker>
<validation-provider <validation-provider
:rules="{ :rules="{
required: true,
min: minlength, min: minlength,
max: maxlength, max: maxlength,
}" }"
:name="$t('form.message')" :name="$t('form.message')"
v-slot="{ errors }" v-slot="{ errors }"
> >
<label class="mt-3">{{ $t('contribution.activity') }}</label> <label class="mt-3">{{ $t('contribution.activity') }} {{ $t('math.asterisk') }}</label>
<b-form-textarea <b-form-textarea
id="contribution-memo" id="contribution-memo"
v-model="form.memo" v-model="form.memo"
rows="3" rows="3"
max-rows="6" max-rows="6"
:placeholder="$t('contribution.yourActivity')"
required required
></b-form-textarea> ></b-form-textarea>
<b-col v-if="errors"> <b-col v-if="errors">
<span v-for="error in errors" class="errors" :key="error">{{ error }}</span> <span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
</b-col> </b-col>
</validation-provider> </validation-provider>
<label class="mt-3">{{ $t('form.amount') }}</label> <label class="mt-3">{{ $t('form.amount') }} {{ $t('math.asterisk') }}</label>
<b-input-group size="lg" prepend="GDD" append=".00"> <b-input-group size="lg" prepend="GDD" append=".00">
<b-form-input <b-form-input
id="contribution-amount" id="contribution-amount"
@ -86,6 +86,7 @@
</b-col> </b-col>
</b-row> </b-row>
</b-form> </b-form>
<p class="p-2">{{ $t('math.asterisk') }} {{ $t('form.mandatoryField') }}</p>
</div> </div>
</template> </template>
<script> <script>

5
frontend/src/locales/de.json
View File

@ -55,7 +55,8 @@
"selectDate": "Wann war dein Beitrag?", "selectDate": "Wann war dein Beitrag?",
"submit": "Einreichen", "submit": "Einreichen",
"submitted": "Der Beitrag wurde eingereicht.", "submitted": "Der Beitrag wurde eingereicht.",
"updated": "Der Beitrag wurde geändert." "updated": "Der Beitrag wurde geändert.",
"yourActivity": "Bitte trage eine Tätigkeit ein!"
}, },
"contribution-link": { "contribution-link": {
"thanksYouWith": "dankt dir mit" "thanksYouWith": "dankt dir mit"
@ -117,6 +118,7 @@
"from": "Von", "from": "Von",
"generate_now": "Jetzt generieren", "generate_now": "Jetzt generieren",
"lastname": "Nachname", "lastname": "Nachname",
"mandatoryField": "Pflichtfeld",
"memo": "Nachricht", "memo": "Nachricht",
"message": "Nachricht", "message": "Nachricht",
"new_balance": "Neuer Kontostand nach Bestätigung", "new_balance": "Neuer Kontostand nach Bestätigung",
@ -204,6 +206,7 @@
"login": "Anmeldung", "login": "Anmeldung",
"math": { "math": {
"aprox": "~", "aprox": "~",
"asterisk": "*",
"equal": "=", "equal": "=",
"minus": "−", "minus": "−",
"pipe": "|" "pipe": "|"

5
frontend/src/locales/en.json
View File

@ -55,7 +55,8 @@
"selectDate": "When was your contribution?", "selectDate": "When was your contribution?",
"submit": "Submit", "submit": "Submit",
"submitted": "The contribution was submitted.", "submitted": "The contribution was submitted.",
"updated": "The contribution was changed." "updated": "The contribution was changed.",
"yourActivity": "Please enter an activity!"
}, },
"contribution-link": { "contribution-link": {
"thanksYouWith": "thanks you with" "thanksYouWith": "thanks you with"
@ -117,6 +118,7 @@
"from": "from", "from": "from",
"generate_now": "Generate now", "generate_now": "Generate now",
"lastname": "Lastname", "lastname": "Lastname",
"mandatoryField": "mandatory field",
"memo": "Message", "memo": "Message",
"message": "Message", "message": "Message",
"new_balance": "Account balance after confirmation", "new_balance": "Account balance after confirmation",
@ -204,6 +206,7 @@
"login": "Login", "login": "Login",
"math": { "math": {
"aprox": "~", "aprox": "~",
"asterisk": "*",
"equal": "=", "equal": "=",
"minus": "−", "minus": "−",
"pipe": "|" "pipe": "|"