Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
aoz-003
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
aoz-003
Commits
6dcee12b
Verified
Commit
6dcee12b
authored
Mar 18, 2019
by
Kaspar Vollenweider
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reword translations for termination to Abschlussevaluation and trial_period to Probezeit-Feedback
parent
3b595a8d
Pipeline
#40112
failed with stage
in 39 minutes and 24 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
app/controllers/reminder_mailings_controller.rb
app/controllers/reminder_mailings_controller.rb
+1
-1
app/views/assignments/terminate.html.slim
app/views/assignments/terminate.html.slim
+2
-2
config/locales/de.yml
config/locales/de.yml
+3
-3
No files found.
app/controllers/reminder_mailings_controller.rb
View file @
6dcee12b
...
...
@@ -35,7 +35,7 @@ class ReminderMailingsController < ApplicationController
else
redirect_to
new_email_template_path
,
notice:
'Sie müssen eine aktive E-Mailvorlage haben,
bevor Sie eine
Beendigung
s E-Mail erstellen können.'
bevor Sie eine
Abschlussevaluation
s E-Mail erstellen können.'
end
authorize
@reminder_mailing
end
...
...
app/views/assignments/terminate.html.slim
View file @
6dcee12b
...
...
@@ -52,13 +52,13 @@ hr
td
=
@assignment
.
hours
.
last
&
.
hours
||
0.0
-
else
h2
.m-t-20
Beendigung
Abschliessen
h2
.m-t-20
Abschlussevaluation
Abschliessen
=
simple_form_for
(
@assignment
,
url:
update_terminated_at_assignment_path
,
method: :put
)
do
|f|
.row
.col-xs-12.col-md-6
fieldset
legend
Rückmeldungen
zur
Beendigung
des
Einsatzes
legend
Rückmeldungen
zur
Abschlussevaluation
des
Einsatzes
=
f
.input
:
term_feedback_activities
=
f
.input
:
term_feedback_success
=
f
.input
:
term_feedback_problems
...
...
config/locales/de.yml
View file @
6dcee12b
...
...
@@ -44,10 +44,10 @@ de:
term_remaining_hours
:
Restliche Stunden
reminder_mailings
:
kinds
:
&id-kinds-enum-values
trial_period
:
Probezeit
trial_period
:
Probezeit
-Feedback
half_year_process_email
:
'
Halbjahres
Prozess'
half_year_process_overdue
:
'
Halbjahres
Erinnerung'
termination
:
Beendigung
termination
:
Abschlussevaluation
acceptance
:
&id-client-acceptance
accepted
:
Angemeldet
rejected
:
Abgelehnt
...
...
@@ -732,7 +732,7 @@ de:
assignment
:
Begleitung
signup
:
Anmeldung
trial
:
Probezeit
termination
:
Beendigung
termination
:
Abschlussevaluation
half_year_process_email
:
'
Halbjahres
Prozess'
half_year_process_overdue
:
'
Halbjahres
Erinnerung'
index
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment