octopress 3.0.0.rc.32 → 3.0.0.rc.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7760d3288e671ee967ac36c64a831e38a920c51b
-  data.tar.gz: 42fe1284e82aa0d83696bbfae60abf1f12d55435
+  metadata.gz: b592fc093e97e386a697674ed6afc49123a36229
+  data.tar.gz: c4e319f97c9ec7c9ca1868268d5bc1f51b125d08
 SHA512:
-  metadata.gz: 3fb02a4b3a4ea8292569b864d2854dd22596ff2c3acbb723bd4ffdeb344821f33c6b36fc262a1f0f43134861574def9f3de56f5b956e513c3747a9363872a0b3
-  data.tar.gz: dbe8213613324e2b72a0aca2af65944f89cca5f12bc09163d9d0aa032140419da3f033cf2e94a08dbb4e7e355b62063427b3553c2fccf082d7d307c360bc50cf
+  metadata.gz: 6f83d00d87e5b87ab1628b9216d6407a02a8e2419c28c8b20bc6abece9fd5421c94d48227b1250c05970cb9855cd8691bbaca7b1b234c750e1982736a2c8ad77
+  data.tar.gz: 03cc61c13df8e7b37debefd536598ff4434c5c346a5e4c737c2c75553b37b6c6d976736e9a2a483be38c0ed56d998b300fa06e88f34a1fdeb3dae85cd7b1076c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 3.0.0 RC33 (2015-02-14)
+
+- Removed `--lang` option from CLI. This adds unnecessary complexity which can be addressed with templates.
+
 ### 3.0.0 RC32 (2015-02-02)
 
 - Added octopress-multilingual to list of plugins which can extend the CLI.

data/README.md

@@ -74,7 +74,6 @@ date: YYYY-MM-DDTHH:MM:SS-00:00
 |:---------------------|:----------------------------------------|
 | `--template PATH`    | Use a template from <path>              |
 | `--date DATE`        | The date for the post. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
-| `--lang LANGUAGE`    | Set post language (e.g. en, it) for multi-language sites. |
 | `--slug SLUG`        | Slug for the new post.                  |
 | `--dir DIR`          | Create post at _posts/DIR/.             |
 | `--force`            | Overwrite existing file.                |
@@ -106,7 +105,6 @@ After the page is created, Octopress will tell you how to configure this new col
 | `--template PATH`    | Use a template from <path>              |
 | `--title TITLE`      | The title of the new page               |
 | `--date DATE`        | The date for the page. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
-| `--lang LANGUAGE`    | Set page language (e.g. en, it) for multi-language sites. |
 | `--force`            | Overwrite existing file.                |
 
 Note: The default page template doesn't expect a date. If you want to add dates
@@ -126,7 +124,6 @@ $ octopress new draft "My Title"
 |:-------------------|:------------------------------------------|
 | `--template PATH`  | Use a template from <path>                |
 | `--date DATE`      | The date for the draft. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) (defaults to Time.now) |
-| `--lang LANGUAGE`  | Set draft language (e.g. en, it) for multi-language sites. |
 | `--slug SLUG`      | The slug for the new post.                |
 | `--force`          | Overwrite existing file.                  |
 

data/lib/octopress/commands/helpers.rb

@@ -5,7 +5,6 @@ module Octopress
     def add_page_options(c)
       c.option 'date',     '-d', '--date DATE', "Use 'now' or a String that is parseable by Time#parse."
       c.option 'template', '-tm', '--template PATH', "New #{c.name.to_s} from a template."
-      c.option 'lang',     '-l', '--lang LANGUAGE', "Set a #{c.name.to_s} language (e.g. en, it) for multi-language sites."
       c.option 'force',    '-f', '--force', 'Overwrite file if it already exists'
     end
 

data/lib/octopress/draft.rb

@@ -35,7 +35,6 @@ module Octopress
       post_options = {
         'title'   => @options['title'],
         'date'    => @options['date'],
-        'lang'    => read_post_yaml('lang'),
         'slug'    => title_slug,
         'content' => read_post_content,
         'dir'     => @options['dir'],

data/lib/octopress/page.rb

@@ -15,10 +15,9 @@ module Octopress
       @site = site
       @config = DEFAULT_OPTIONS.merge(site.config)
       @options = options
-      @options['lang'].downcase! if @options['lang']
       set_default_options
 
-      @front_matter = %w{layout title date lang}
+      @front_matter = %w{layout title date}
 
       # Ensure title
       #

data/lib/octopress/post.rb

@@ -13,12 +13,6 @@ module Octopress
       @options['extension'] ||= @config['post_ext']
       @options['template']  ||= @config['post_template']
       @options['dir']       ||= ''
-
-      # Language dir should always be added if language is set
-      #
-      if @options['lang']
-        @options['dir']       = File.join(@options['lang'], @options['dir'])
-      end
     end
 
     def path

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.32"
+  VERSION = "3.0.0.rc.33"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.32
+  version: 3.0.0.rc.33
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary