Download as
Browse Code »

Commit d50ac31c1ff602ba6cbc13dab4c7738936127833

Authored by Leandro Santos
2 parents df49d037 9807e0ad
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'master' into next

Showing 3 changed files with 2 additions and 27 deletions   Show diff stats
plugins/pjax/lib/pjax_plugin.rb
  Diff comments   View file @d50ac31
1 class PjaxPlugin < Noosfero::Plugin 1 class PjaxPlugin < Noosfero::Plugin
2 2
3 def self.plugin_name 3 def self.plugin_name
4 - I18n.t('pjax_plugin.lib.plugin.name') 4 + _('Pjax plugin')
5 end 5 end
6 6
7 def self.plugin_description 7 def self.plugin_description
8 - I18n.t('pjax_plugin.lib.plugin.description') 8 + _("Use pjax for page's links")
9 end 9 end
10 10
11 def stylesheet? 11 def stylesheet?
plugins/pjax/locales/en.yml
View file @df49d03
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -  
2 -"en": &en-US  
3 - pjax_plugin:  
4 - lib:  
5 - plugin:  
6 - name: "pjax plugin"  
7 - description: "Use pjax for page's links"  
8 -  
9 -'en_US':  
10 - <<: *en-US  
11 -'en-US':  
12 - <<: *en-US  
plugins/pjax/locales/pt.yml
View file @df49d03
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1 -  
2 -"pt": &pt-BR  
3 - pjax_plugin:  
4 - lib:  
5 - plugin:  
6 - name: "pjax plugin"  
7 - description: "Usa o pjax para os links da página"  
8 -  
9 -'pt_BR':  
10 - <<: *pt-BR  
11 -'pt-BR':  
12 - <<: *pt-BR  
13 -