Merge pull request prat0318#37 from drorata/dev

Enable custom locale definitions

README.md

@@ -87,6 +87,12 @@ Support for ``en``, ``ge``, ``es``, ``fi``, ``pl`` and ``pt`` right now. Pull re
     $ json_resume convert --locale=es prateek_cv.json
 ```
 
+It is also possible to define a custom location for locale definitions.
+Pass the option `--locale_dir=path/to/defs`.
+In this location there should be the definitions available.
+The default one is `en.yml`, others may be provided as well.
+This is useful if you want to define new headings.
+
 ## Markup Language
 
 JSON is parsed as per the `markdown` standards. This implies all this works-

bin/json_resume

@@ -26,6 +26,7 @@ class JsonResumeCLI < Thor
   desc 'convert /path/to/json/file', 'converts the json to pretty resume format'
   option :out, default: 'html', banner: 'output_type', desc: 'html|html_pdf|tex|tex_pdf|md'
   option :template, banner: 'template_path', desc: 'path to customized template (optional)'
+  option :locale_dir, desc: 'path to locale definitions (optional)'
   option :locale, default: 'en', banner: 'locale', desc: 'en|ge|es|pl|pt|zh_cn'
   option :theme, default: 'default', banner: 'theme', desc: 'default|classic'
   option :dest_dir, default: 'current', banner: 'dest_dir', desc: 'location of dest. dir (optional)'
@@ -185,7 +186,13 @@ class JsonResumeCLI < Thor
     end
 
     def assign_i18n(locale)
-      I18n.load_path = Dir["#{@@orig_locn}/../locale/*.yml"]
+      if options[:locale_dir]
+        locale_dir = "#{File.expand_path(options[:locale_dir])}/*.yml"
+      else
+        locale_dir = "#{@@orig_locn}/../locale/*.yml"
+      end
+      puts "Using #{locale_dir} for locale files"
+      I18n.load_path = Dir[locale_dir]
       I18n.enforce_available_locales = true
       I18n.locale = locale.to_sym
     end

lib/json_resume/version.rb

@@ -1,3 +1,3 @@
 module JsonResume
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end