diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
| commit | 8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch) | |
| tree | 1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /lib | |
| parent | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff) | |
| parent | 600574759573e48da9f5f82d4ff8a863b6830c95 (diff) | |
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'lib')
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/generators/nifty/scaffold/templates/locale.yml b/lib/generators/nifty/scaffold/templates/locale.yml index 46e4ce3..4cae1c4 100644 --- a/lib/generators/nifty/scaffold/templates/locale.yml +++ b/lib/generators/nifty/scaffold/templates/locale.yml @@ -11,7 +11,7 @@ en: <%= attribute.name %>: '<%= attribute.human_name %>' <%- end -%> actions: - confirm: 'Are you sure you want to delete this <%= human_name %>?' + confirm_destroy: 'Are you sure you want to delete this <%= human_name %>?' destroy: 'Delete' edit: 'Edit' show: 'View' @@ -23,7 +23,7 @@ en: <%= attribute.name %>: '<%= attribute.human_name %>' <%- end -%> actions: - confirm: 'Are you sure you want to delete this element?' + confirm_destroy: 'Are you sure you want to delete this element?' destroy: 'Delete' edit: 'Edit' view_all: 'View All' @@ -43,4 +43,4 @@ en: label: '<%= attribute.human_name %>' hint: '' <%- end -%> - button: 'Submit'
\ No newline at end of file + submit: 'Submit'
\ No newline at end of file diff --git a/lib/generators/nifty/scaffold/templates/locale_de.yml b/lib/generators/nifty/scaffold/templates/locale_de.yml index 027d36d..e170812 100644 --- a/lib/generators/nifty/scaffold/templates/locale_de.yml +++ b/lib/generators/nifty/scaffold/templates/locale_de.yml @@ -11,7 +11,7 @@ de: <%= attribute.name %>: '<%= attribute.human_name %>' <%- end -%> actions: - confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: <%= human_name %>' + confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: <%= human_name %>' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' @@ -23,7 +23,7 @@ de: <%= attribute.name %>: '<%= attribute.human_name %>' <%- end -%> actions: - confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?' + confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' view_all: 'Alle anzeigen' @@ -43,4 +43,4 @@ de: label: '<%= attribute.human_name %>' hint: '' <%- end -%> - button: 'Absenden'
\ No newline at end of file + submit: 'Absenden'
\ No newline at end of file diff --git a/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml b/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml index a523d32..f142d15 100644 --- a/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml +++ b/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml @@ -1,4 +1,4 @@ -%table{:class => 'table table-striped'} +%table.table.table-striped %tr <%- for attribute in model_attributes -%> %th= t('<%= plural_name %>.index.<%= attribute.name %>') |