diff --git a/.bundle/config b/.bundle/config
index 6efc687..7e5680e 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -1,2 +1,3 @@
---
BUNDLE_PATH: "gems"
+BUNDLE_DISABLE_SHARED_GEMS: "true"
diff --git a/Gemfile b/Gemfile
index 912bcb4..866365e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,8 @@ gem 'rake'
gem 'rackup'
gem 'puma'
gem 'sqlite3'
+gem 'base64', '0.1.1'
+gem 'forwardable', '1.3.2'
gem 'bcrypt'
gem 'gettext'
gem 'chartkick'
diff --git a/Gemfile.lock b/Gemfile.lock
index 995a623..86848de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,7 +19,7 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
- base64 (0.2.0)
+ base64 (0.1.1)
bcrypt (3.1.20)
benchmark (0.4.0)
bigdecimal (3.1.9)
@@ -28,7 +28,7 @@ GEM
connection_pool (2.5.0)
drb (2.2.1)
erubi (1.13.1)
- forwardable (1.3.3)
+ forwardable (1.3.2)
gettext (3.5.1)
erubi
locale (>= 2.0.5)
@@ -91,8 +91,10 @@ PLATFORMS
x86_64-linux
DEPENDENCIES
+ base64 (= 0.1.1)
bcrypt
chartkick
+ forwardable (= 1.3.2)
gettext
puma
rackup
@@ -102,4 +104,4 @@ DEPENDENCIES
sqlite3
BUNDLED WITH
- 2.5.22
+ 2.3.15
diff --git a/Rakefile b/Rakefile
index 5fe207c..bfa6157 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,8 +5,8 @@ desc "Update PO files"
task :updatepo do
require 'gettext/tools/xgettext'
GetText::Tools::XGetText.run(*["vedia.rb"] + Dir.glob("views/*.{rb,erb}") + ["-o", "po/vedia.pot"])
- require "gettext/tools/msgmerge"
- Dir.glob('po/**/vedia.po').collect { |po| /po\/(.+)\/vedia\.po/.match(po)[1] }.each do |locale|
+ require 'gettext/tools/msgmerge'
+ Dir.glob("po/**/vedia.po").collect { |po| /po\/(.+)\/vedia\.po/.match(po)[1] }.each do |locale|
GetText::Tools::MsgMerge.run("po/#{locale}/vedia.po", "po/vedia.pot", "-o", "po/#{locale}/vedia.po")
end
end
@@ -14,7 +14,9 @@ end
desc "Build MO files"
task :buildmo do
require 'gettext/tools/msgfmt'
- Dir.glob('po/**/vedia.po').collect { |po| /po\/(.+)\/vedia\.po/.match(po)[1] }.each do |locale|
+ Dir.mkdir("locale") unless Dir.exist?("locale")
+ Dir.glob("po/**/vedia.po").collect { |po| /po\/(.+)\/vedia\.po/.match(po)[1] }.each do |locale|
+ Dir.mkdir("locale/#{locale}") unless Dir.exist?("locale/#{locale}")
GetText::Tools::MsgFmt.run("po/#{locale}/vedia.po", "-o", "locale/#{locale}/vedia.mo")
end
end
diff --git a/views/layout.erb b/views/layout.erb
index d785e0b..da0085e 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -1,7 +1,8 @@
-
+
-
+
+
Vedia