Skip to content

Commit

Permalink
Change texts for user description, fixes #1282
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Altmann committed Feb 16, 2015
1 parent 394af7c commit fbc4ea5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion app/views/devise/registrations/edit.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,10 @@ h1= t('common.actions.edit_profile')
.visibility
= t('users.visibility.public')

= f.input :about_me, as: :text, limit: 2500, input_html: {class: "tinymce"}
h4= "#{ t('formtastic.labels.user.about_me') }"

= f.input :about_me, label:false, as: :text, limit: 2500,
input_html: { class: 'tinymce' }
= tinymce


Expand Down
4 changes: 2 additions & 2 deletions config/locales/gems/formtastic/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ de:
phone: "Telefonnummer (Festnetz)"
mobile: "Telefonnummer (Mobil)"
fax: "Fax"
about_me: "über mich"
about_me: "Hier kannst Du Dich anderen Nutzer*innen vorstellen. Dein Text erscheint in Deinem Profil."
terms: "AGB"
cancellation: "Widerrufsbelehrung"
cancellation_form: "Widerrufsformular (PDF-Datei)"
Expand Down Expand Up @@ -230,7 +230,7 @@ de:
user: &input_step_user
account: Benutzerkonto
contact: Anschrift und Kontakt
profile: Profil
profile: Über mich
payment: Zahlungsoptionen
terms: Rechtliches
unified_transport: Angaben zu Versandrabatten
Expand Down
2 changes: 1 addition & 1 deletion config/tinymce.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
default:
width : "100%"
height : 400
height : 300
menubar: false
statusbar: false
toolbar: undo redo | styleselect | bold italic | bullist numlist | code
Expand Down

0 comments on commit fbc4ea5

Please sign in to comment.