Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Andres Keskküla 2014-10-22 11:09:14 +03:00
commit ed34483bc2
9 changed files with 107 additions and 38 deletions

View file

@ -15,15 +15,6 @@ set :deploy_to, '/home/app/registry'
set :repository, 'https://github.com/internetee/registry'
set :branch, 'master'
task :registrar do
set :deploy_to, '/home/app/registrar'
end
# shortcut for registrar
task :re do
set :deploy_to, '/home/app/registrar'
end
task :eedirekt do
set :deploy_to, '/home/app/eedirekt'
end

View file

@ -102,7 +102,7 @@ en:
out_of_range: 'Period must add up to 1, 2 or 3 years'
not_a_number: 'Period is not a number'
auth_info:
wrong_pw: 'Authentication error'
wrong_pw: 'Authorization error'
domain_statuses:
invalid: 'Statuses are invalid'
not_found: 'Status was not found'