From 016972869428fdf02045b23357d90f8c2bfa8669 Mon Sep 17 00:00:00 2001
From: Axel Liljencrantz
- <%= f.label :lodo_name, t(:lodo_name, :scope => :accounts) %>
- <%= f.text_field :lodo_name %>
+ <%= f.label :dodo_name, t(:dodo_name, :scope => :accounts) %>
+ <%= f.text_field :dodo_name %>
<%= f.label :debit_text, t(:debit_text, :scope => :accounts) %>
diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index 92c4684..5aaf624 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -9,8 +9,8 @@
- <%= t(:lodo_name, :scope => :accounts) -%>: - <%= @account.lodo_name %> + <%= t(:dodo_name, :scope => :accounts) -%>: + <%= @account.dodo_name %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 93a9e45..bbde4fe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -86,7 +86,7 @@ en: destroy: "Destroy" confirm_delete: "Confirm you want to delete the account %{name}" new_account: "New account" - lodo_name: "Lodo name" + dodo_name: "Dodo name" debit_text: "Debit text" credit_text: "Credit text" vat_account: "VAT account" diff --git a/config/locales/nb.yml b/config/locales/nb.yml index a2b5ad4..ec07252 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -201,7 +201,7 @@ name: "Navn" confirm_delete: "Bekreft sletting av konto %{name}" new_account: "Ny konto" - lodo_name: "Lodo navn" + dodo_name: "Dodo navn" debit_text: "Debit tekst" credit_text: "Credit tekst" vat_account: "MVA-konto" @@ -361,7 +361,7 @@ login: login: Logg inn maintainance: Vedlikehold - welcome: Velkommen til lodo regnskap + welcome: Velkommen til Dodo regnskap units: header_edit: Kjemperedigerer avdelning header_index: Kjempelister avdelninger diff --git a/db/migrate/20101020075648_rename_lodo_name.rb b/db/migrate/20101020075648_rename_lodo_name.rb new file mode 100644 index 0000000..6cf7431 --- /dev/null +++ b/db/migrate/20101020075648_rename_lodo_name.rb @@ -0,0 +1,9 @@ +class RenameLodoName < ActiveRecord::Migration + def self.up + rename_column(:accounts, :lodo_name, :dodo_name) + end + + def self.down + rename_column(:accounts, :dodo_name, :lodo_name) + end +end diff --git a/test/blueprints.rb b/test/blueprints.rb index bdfc1e0..a7596d6 100644 --- a/test/blueprints.rb +++ b/test/blueprints.rb @@ -100,7 +100,7 @@ def print_time name, &block Account.blueprint do name { Sham.account_name } - lodo_name { name } + dodo_name { name } number { rand(10000) } debit_text { "debit" } credit_text { "credit" } @@ -196,7 +196,7 @@ def print_time name, &block # create some accounts companies.each do |c| print '.' - # Vat accounts from empatix @ lodo.no + # Vat accounts from empatix @ nodo.no # **** Outgoing vat; sales *** a2700 = Account.make(:company => c, :name => "Utg mva kode 10", :number => 2700) diff --git a/test/bulkdata.rb b/test/bulkdata.rb index d37d21e..999ce64 100644 --- a/test/bulkdata.rb +++ b/test/bulkdata.rb @@ -109,7 +109,7 @@ def print_time name, &block Account.blueprint do name { Sham.account_name } - lodo_name { name } + dodo_name { name } number { rand(10000) } debit_text { "debit" } credit_text { "credit" } diff --git a/test/unit/company_test.rb b/test/unit/company_test.rb index e8a4639..e31a1a5 100644 --- a/test/unit/company_test.rb +++ b/test/unit/company_test.rb @@ -26,7 +26,7 @@ class CompanyTest < ActiveSupport::TestCase assert_equal template.projects.size, company.projects.size # let's compare the accounts for good measure - f = proc {|acc| [acc.number, acc.name, acc.lodo_name]} + f = proc {|acc| [acc.number, acc.name, acc.dodo_name]} assert_equal Set.new(template.accounts.map(&f)), Set.new(company.accounts.map(&f)) # find account with a vat account and compare vat accounts..