[noosfero/noosfero][master] 3 commits: Merge branch 'master' of gitlab.com:noosfero/noosfero

[Leandro Nunes]

Leandro Nunes pushed to master at Noosfero / noosfero


Commits:
aa9dccef by Leandro Nunes dos Santos at 2015-03-18T22:25:53Z
Merge branch 'master' of gitlab.com:noosfero/noosfero

- - - - -
a7c845ce by Leandro Nunes dos Santos at 2015-03-19T22:41:23Z
Merge branch 'master' of gitlab.com:participa/noosfero

- - - - -
af945200 by Leandro Nunes dos Santos at 2015-03-20T10:41:33Z
pjax: making localization with gettext

- - - - -


3 changed files:

- plugins/pjax/lib/pjax_plugin.rb
- − plugins/pjax/locales/en.yml
- − plugins/pjax/locales/pt.yml


Changes:

=====================================
plugins/pjax/lib/pjax_plugin.rb
=====================================
--- a/plugins/pjax/lib/pjax_plugin.rb
+++ b/plugins/pjax/lib/pjax_plugin.rb
@@ -1,11 +1,11 @@
 class PjaxPlugin < Noosfero::Plugin
 
   def self.plugin_name
-    I18n.t('pjax_plugin.lib.plugin.name')
+    _('pjax_plugin.lib.plugin.name')
   end
 
   def self.plugin_description
-    I18n.t('pjax_plugin.lib.plugin.description')
+    _('pjax_plugin.lib.plugin.description')
   end
 
   def stylesheet?

=====================================
plugins/pjax/locales/en.yml deleted
=====================================
--- a/plugins/pjax/locales/en.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-"en": &en-US
-  pjax_plugin:
-    lib:
-      plugin:
-        name: "pjax plugin"
-        description: "Use pjax for page's links"
-
-'en_US':
-  <<: *en-US
-'en-US':
-  <<: *en-US

=====================================
plugins/pjax/locales/pt.yml deleted
=====================================
--- a/plugins/pjax/locales/pt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-"pt": &pt-BR
-  pjax_plugin:
-    lib:
-      plugin:
-        name: "pjax plugin"
-        description: "Usa o pjax para os links da página"
-
-'pt_BR':
-  <<: *pt-BR
-'pt-BR':
-  <<: *pt-BR
-


View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/daa978936e10e2f48343646259796a87bb10ba21...af9452005502d634a53aa7bce51525bae5afbcdf
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150320/8297f874/attachment.html>