Skip to content


Subversion checkout URL

You can clone with
Download ZIP


Rails3, clean upgrade fixing few of the issues #25

wants to merge 41 commits into from
+6,587 −11,023

7 participants


What's about :

Rails 3 routes
Gemfile and Gemspec dependencies
Dedicated JS

Fix issues : 15, 19, take some from 20 (+ cleaning, - google translate), 23

lifo and others added some commits
@lifo lifo Make migration generator work with Rails 3 c69d728
@lifo lifo named_scope -> scope and <% -> <%= ff92009
@lifo lifo Latest will_paginate/rails3 6f3bedf
@lifo lifo Remove bundled will_paginate 162d791
@lifo lifo No need for monkey patched link renderer de6ca66
@lifo lifo Add Gemfile for will_paginate/rails3 a226141
@lifo lifo More rails3 compatibility and get rid of custom LinkRenderer 17625d6
@lifo lifo Move tasks to lib/ 83ffa4b
@lifo lifo Add a gemspec a496269
@lifo lifo Engine definition for Rails 3 9d2883f
@lifo lifo Fix gemspec cc96ff9
@lifo lifo Use Rails 3 route syntax 274c5c6
@lifo lifo Require w_p and ya2yaml 66a0a57
@lifo lifo Add rake tolk:import_assets for copying asstes to the app 0cf67e0
@dhh The lines must line up 29576df
@dhh Rails 3 wants Mime::YAML not YML 18fb33c
@dhh Add a setup task that does all the legwork of getting Tolk running in…
… your app
@dhh Update readme for Rails 3 and setup stuff 4a13f0b
@dhh Add a changelog 22f34f5
@wvanbergen wvanbergen Added simple variable checking when validating translations. ac77341
@wvanbergen wvanbergen Also detect %{variable} in translations. 7d7ed74
@lifo lifo Merge remote branch 'wvanbergen/master' into rails3 863399b
@atog atog Load Tolk::Sync and Tolk::Import 3dc56f8
Rebecca Breu allow will_paginate >= 3.0.pre 25c88e1
Benjamin Quorning Removed space between spans in h1 a17fc25
Benjamin Quorning Render H1 in the layout file, let CSS handle the case of having no @l… 2c95971
Benjamin Quorning Link to tolk_locale_path from div#head>span.locale 7743dc6
@lifo lifo Merge branch 'master' into rails3
@ZenCocoon ZenCocoon Merge remote branch '10to1/rails3' into rails3 43ecdf4
@ZenCocoon ZenCocoon Isolate JS and update to HTML5. 50b1b17
@ZenCocoon ZenCocoon Update Gemfile & gemspec to satisfy dependencies a7f7730
Simon Tokumine correct japanese, chinese & portuguese locale codes 63b39eb
@ZenCocoon ZenCocoon Requires will_paginate 3.0.pre2 or greater ed1e435
@ZenCocoon ZenCocoon Fix conflicted merge 67bdf93
@cover cover rails3 routes 90f8c6a
@ZenCocoon ZenCocoon Typo. Thanks rosenfeld d1c6b4b
@ZenCocoon ZenCocoon Improve header. Thanks bquorning 70bef13
@dhh Mime::YML is being set by the initializer, so dont need it in init.rb…
… as well
@ZenCocoon ZenCocoon Merge remote-tracking branch 'upstream/rails3' into rails3 5506037
@ZenCocoon ZenCocoon Fix for Rails 3.0.9 following SafeBuffer security fix cd3d81e
@ZenCocoon ZenCocoon Specify encoding 1aebee5

Main commits are in 1.2.0


have you merged or fixed this issues or you like contributions back to ?


These are now merged in tolk/tolk master thank you.
I'm now looking at #20 to see what needs to be merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 3, 2010
  1. @lifo
  2. @lifo
  3. @lifo

    Latest will_paginate/rails3

    lifo authored
  4. @lifo

    Remove bundled will_paginate

    lifo authored
  5. @lifo
  6. @lifo
  7. @lifo
  8. @lifo

    Move tasks to lib/

    lifo authored
Commits on Jun 4, 2010
  1. @lifo

    Add a gemspec

    lifo authored
  2. @lifo

    Engine definition for Rails 3

    lifo authored
  3. @lifo

    Fix gemspec

    lifo authored
  4. @lifo

    Use Rails 3 route syntax

    lifo authored
  5. @lifo

    Require w_p and ya2yaml

    lifo authored
  6. @lifo
Commits on Jun 6, 2010
  1. The lines must line up

  2. Rails 3 wants Mime::YAML not YML

Commits on Jun 7, 2010
  1. Add a changelog

  2. @wvanbergen
Commits on Jun 8, 2010
  1. @wvanbergen
  2. @lifo
Commits on Sep 17, 2010
  1. @atog

    Load Tolk::Sync and Tolk::Import

    atog authored
Commits on Oct 6, 2010
  1. allow will_paginate >= 3.0.pre

    Rebecca Breu authored
Commits on Jan 4, 2011
  1. Removed space between spans in h1

    Benjamin Quorning authored
  2. Link to tolk_locale_path from div#head>span.locale

    Benjamin Quorning authored
Commits on Jan 7, 2011
  1. @lifo

    Merge branch 'master' into rails3

    lifo authored
Commits on Mar 2, 2011
  1. @ZenCocoon
  2. @ZenCocoon
  3. @ZenCocoon
  4. @ZenCocoon

    correct japanese, chinese & portuguese locale codes

    Simon Tokumine authored ZenCocoon committed
  5. @ZenCocoon
  6. @ZenCocoon

    Fix conflicted merge

    ZenCocoon authored
  7. @cover @ZenCocoon

    rails3 routes

    cover authored ZenCocoon committed
  8. @ZenCocoon

    Typo. Thanks rosenfeld

    ZenCocoon authored
  9. @ZenCocoon
Commits on Mar 11, 2011
Commits on Apr 3, 2011
  1. @ZenCocoon
Commits on Jun 15, 2011
  1. @ZenCocoon
Commits on Jan 31, 2012
  1. @ZenCocoon

    Specify encoding

    ZenCocoon authored
Something went wrong with that request. Please try again.