Compare commits

..

No commits in common. "2ca2d010df5618e19078eb830e995853b13ed34f" and "6106e088dfa434b739898a6f4d5a8f64a096c2b6" have entirely different histories.

5 changed files with 8 additions and 16 deletions

View file

@ -1,3 +1,2 @@
--- ---
BUNDLE_PATH: "gems" BUNDLE_PATH: "gems"
BUNDLE_DISABLE_SHARED_GEMS: "true"

View file

@ -6,8 +6,6 @@ gem 'rake'
gem 'rackup' gem 'rackup'
gem 'puma' gem 'puma'
gem 'sqlite3' gem 'sqlite3'
gem 'base64', '0.1.1'
gem 'forwardable', '1.3.2'
gem 'bcrypt' gem 'bcrypt'
gem 'gettext' gem 'gettext'
gem 'chartkick' gem 'chartkick'

View file

@ -19,7 +19,7 @@ GEM
minitest (>= 5.1) minitest (>= 5.1)
securerandom (>= 0.3) securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5) tzinfo (~> 2.0, >= 2.0.5)
base64 (0.1.1) base64 (0.2.0)
bcrypt (3.1.20) bcrypt (3.1.20)
benchmark (0.4.0) benchmark (0.4.0)
bigdecimal (3.1.9) bigdecimal (3.1.9)
@ -28,7 +28,7 @@ GEM
connection_pool (2.5.0) connection_pool (2.5.0)
drb (2.2.1) drb (2.2.1)
erubi (1.13.1) erubi (1.13.1)
forwardable (1.3.2) forwardable (1.3.3)
gettext (3.5.1) gettext (3.5.1)
erubi erubi
locale (>= 2.0.5) locale (>= 2.0.5)
@ -91,10 +91,8 @@ PLATFORMS
x86_64-linux x86_64-linux
DEPENDENCIES DEPENDENCIES
base64 (= 0.1.1)
bcrypt bcrypt
chartkick chartkick
forwardable (= 1.3.2)
gettext gettext
puma puma
rackup rackup
@ -104,4 +102,4 @@ DEPENDENCIES
sqlite3 sqlite3
BUNDLED WITH BUNDLED WITH
2.3.15 2.5.22

View file

@ -5,8 +5,8 @@ desc "Update PO files"
task :updatepo do task :updatepo do
require 'gettext/tools/xgettext' require 'gettext/tools/xgettext'
GetText::Tools::XGetText.run(*["vedia.rb"] + Dir.glob("views/*.{rb,erb}") + ["-o", "po/vedia.pot"]) GetText::Tools::XGetText.run(*["vedia.rb"] + Dir.glob("views/*.{rb,erb}") + ["-o", "po/vedia.pot"])
require 'gettext/tools/msgmerge' require "gettext/tools/msgmerge"
Dir.glob("po/**/vedia.po").collect { |po| /po\/(.+)\/vedia\.po/.match(po)[1] }.each do |locale| 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") GetText::Tools::MsgMerge.run("po/#{locale}/vedia.po", "po/vedia.pot", "-o", "po/#{locale}/vedia.po")
end end
end end
@ -14,9 +14,7 @@ end
desc "Build MO files" desc "Build MO files"
task :buildmo do task :buildmo do
require 'gettext/tools/msgfmt' require 'gettext/tools/msgfmt'
Dir.mkdir("locale") unless Dir.exist?("locale") Dir.glob('po/**/vedia.po').collect { |po| /po\/(.+)\/vedia\.po/.match(po)[1] }.each do |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") GetText::Tools::MsgFmt.run("po/#{locale}/vedia.po", "-o", "locale/#{locale}/vedia.mo")
end end
end end

View file

@ -1,8 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Vedia</title> <title>Vedia</title>
<script src="/chartkick.js"></script> <script src="/chartkick.js"></script>
<script src="/Chart.bundle.js"></script> <script src="/Chart.bundle.js"></script>