Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

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