Skip to content

Loading…

Some fork merges and features #20

Closed
wants to merge 45 commits into from

8 participants

@cover
  • rails 3 branch
  • tokumine fork in order to add google translate support
  • zencocoon fork in order to add search by key
  • feature to be able to change the primary language when showing a locale, with a fallback to the primary one
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
77d0ed3
@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
Simon Tokumine working with postgres. updated view so nested models call generates p…
…ostgres friendly SQL
ecf2aa8
Simon Tokumine ensure text area resizes properly (measure isn't a method of td) f15dfc3
Simon Tokumine when translator clicks on empty textarea, fill with google translate …
…results as a guide
0d308fd
Simon Tokumine improve commenting 79b8dbd
Simon Tokumine don't overwrite existing translations with google translate on click e32021e
Simon Tokumine correct japanese, chinese & portuguese locale codes 4b90732
Simon Tokumine updated readme 4f7da04
@ZenCocoon ZenCocoon Allow to search by key 19bebb2
@cover cover Merge branch 'master' of git://github.com/tokumine/tolk
Conflicts:
	app/models/tolk/locale.rb
efab25a
@cover cover Added the ability to choose an alternate primary language bd2f37d
@cover cover Merge branch 'rails3' of git://github.com/dhh/tolk
Conflicts:
	app/models/tolk/translation.rb
	test/locales/formats/en.yml
5b6f6c1
@cover cover Merge branch 'search_key' of git://github.com/ZenCocoon/tolk 330f178
@cover cover Using native names and not english names 836e930
@cover cover w3c validation cleanup 8e97ab6
@cover cover Better manage return carriage on yml and gtranslate 8ffd8f4
@cover cover Fixed the languages codes and names using the gtranslate api v1 refer…
…ence + wikipedia iso 639-2 page
02a26f7
@MBO MBO Change will paginate version in Gemfile to pre2 9a6bd7a
@MBO MBO Change dependency for will_paginate to require 3.0.pre2 version e6b1dac
@MBO MBO Update gemspec 382fc1f
@MBO MBO Remove warnings c6fb3ef
@tokumine

Would love to see this merge

+1

@ZenCocoon

Commit f15dfc3 is actually a regression. Element.measure is a proper PrototypeJS method introduced in 1.7

@ZenCocoon

A different option at #25
This pull request keep similar functions, no extra like Google Translate or search_key

@ZenCocoon

@thomasdarde If you merged #25 and have already done search_key support, only Google Translate should be missing.

@thomasdarde
Collaborator

Ok thanks, I want to add an optional config file for google translate.
There is also the languages name translations, but I don't think it's a good idea.

@ZenCocoon

Nice idea to have a config file. Google Translate support clearly feels well into such config.

For the languages name translations, it's actually interesting even if I don't like any of the current approaches.

  • all English: not so good if Tolk itself is translated and used by non English (or latin) reader.
  • all native names: as an example, it seems impossible for me to differentiate Chinese and Japanese if written in there native language.

On way approached on public sites is the current language name and the native name together, example, visiting a French version of Tolk would give a language list with :

Anglais - English
Italien - Italiano
...

However, I'm not sure an admin tool such as Tolk needs such polished details. Sure a contribution would feel welcome but doubt it's a priority to focus on.

@thomasdarde
Collaborator

Master version of Tolk now handles a config file.
@tokumine A new contribution linked to Google translate would be much appreciated !

I'm against adding localized locale name directly, I personnaly use the Locale's english_name method of the in an application.
The config file now allows to replace locale names easily.

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 committed
  4. @lifo

    Remove bundled will_paginate

    lifo committed
  5. @lifo
  6. @lifo
  7. @lifo
  8. @lifo

    Move tasks to lib/

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

    Add a gemspec

    lifo committed
  2. @lifo

    Engine definition for Rails 3

    lifo committed
  3. @lifo

    Fix gemspec

    lifo committed
  4. @lifo

    Use Rails 3 route syntax

    lifo committed
  5. @lifo

    Require w_p and ya2yaml

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

    committed
  2. Rails 3 wants Mime::YAML not YML

    committed
Commits on Jun 7, 2010
  1. Add a changelog

    committed
  2. @wvanbergen
Commits on Jun 8, 2010
  1. @wvanbergen
  2. @lifo
Commits on Jul 17, 2010
  1. working with postgres. updated view so nested models call generates p…

    Simon Tokumine committed
    …ostgres friendly SQL
Commits on Jul 18, 2010
  1. when translator clicks on empty textarea, fill with google translate …

    Simon Tokumine committed
    …results as a guide
  2. improve commenting

    Simon Tokumine committed
  3. correct japanese, chinese & portuguese locale codes

    Simon Tokumine committed
Commits on Sep 29, 2010
  1. updated readme

    Simon Tokumine committed
Commits on Oct 8, 2010
  1. @ZenCocoon

    Allow to search by key

    ZenCocoon committed
Commits on Nov 23, 2010
  1. @cover

    Merge branch 'master' of git://github.com/tokumine/tolk

    cover committed
    Conflicts:
    	app/models/tolk/locale.rb
Commits on Nov 24, 2010
  1. @cover
  2. @cover

    Merge branch 'rails3' of git://github.com/dhh/tolk

    cover committed
    Conflicts:
    	app/models/tolk/translation.rb
    	test/locales/formats/en.yml
  3. @cover
  4. @cover
  5. @cover

    w3c validation cleanup

    cover committed
Commits on Nov 26, 2010
  1. @cover
  2. @cover

    Fixed the languages codes and names using the gtranslate api v1 refer…

    cover committed
    …ence + wikipedia iso 639-2 page
Commits on Dec 2, 2010
  1. @MBO
  2. @MBO
  3. @MBO

    Update gemspec

    MBO committed
Commits on Dec 4, 2010
  1. @MBO

    Remove warnings

    MBO committed
Commits on Feb 4, 2011
  1. @cover
  2. @cover

    rails3 routes

    cover committed
  3. @cover
Something went wrong with that request. Please try again.