Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master', remote-tracking branch 'origin' into dsl-refac…

…toring
  • Loading branch information...
commit 14cdd3be4ada38f8e6974935f806c8de170abf11 2 parents 9bdddac + 5fd54ad
Benoit Bénézech bbenezech authored
2  Gemfile
... ... @@ -1,4 +1,4 @@
1   -source 'http://rubygems.org'
  1 +source 'https://rubygems.org'
2 2
3 3 # Bundle gems for the local environment. Make sure to
4 4 # put test-only gems in this group so their generators
2  app/assets/stylesheets/rails_admin/custom/theming.css.scss
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 Customize RailsAdmin theme here.
3   - Copy this file to your app/assets/rails_admin/custom/theming.css.scss, leave this one untouched
  3 + Copy this file to your app/assets/stylesheets/rails_admin/custom/theming.css.scss, leave this one untouched
4 4 Don't require it in your application.rb
5 5
6 6 Look at the markup in RailsAdmin and go there to get inspiration from:
3  config/locales/rails_admin.nb.yml
@@ -65,7 +65,7 @@ nb:
65 65 are_you_sure_you_want_to_delete_the_object: "Er du sikker på at du vil slette denne %{model_name}"
66 66 confirmation: "Ja, jeg er sikker"
67 67 delete_confirmation: "Bekreft sletting"
68   - bulk_delete: "The following objects will be deleted, which may delete or orphan some of their related dependencies:"
  68 + bulk_delete: "De følgende objektene bli slettet, som også kan påvirke assosierte objekter:"
69 69 export:
70 70 confirmation: "Eksportér til %{name}"
71 71 select: "Velg felter for eksport"
@@ -74,6 +74,7 @@ nb:
74 74 display: "Vis %{name}: %{type}"
75 75 options_for: "Valg for %{name}"
76 76 empty_value_for_associated_objects: "<blank>"
  77 + click_to_reverse_selection: 'Klikk for å inkludere/ekskludere utvalget'
77 78 csv:
78 79 header_for_root_methods: "%{name}" # 'model' is available
79 80 header_for_association_methods: "%{name} [%{association}]"

0 comments on commit 14cdd3b

Please sign in to comment.
Something went wrong with that request. Please try again.