Download as
Browse Code »

Commit ce9a334d0d9f434de7841df6095523a06f45c53f

Authored by Victor Costa
2 parents 08f649a3 2b62ed30
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'stable' of gitlab.com:participa/noosfero into stable

Showing 3 changed files with 51 additions and 19 deletions   Show diff stats
plugins/community_hub/views/cms/community_hub_plugin/_hub.html.erb
  Diff comments   View file @ce9a334
@@ -11,36 +11,39 @@ @@ -11,36 +11,39 @@
11 <div> 11 <div>
12 <h2><%= _('Twitter Settings:') %></h2> 12 <h2><%= _('Twitter Settings:') %></h2>
13 </div> 13 </div>
14 - <br />  
15 - <%= check_box(:article, :twitter_enabled) %> <span><%= _("Turn on TWITTER") %></span>  
16 - <br />  
17 - <span><%= labelled_form_field(_('Twitter\'s Hashtags, comma separated words<br>(example: participa.br,participabr,arenanetmundial,netmundial'), text_field(:article, :twitter_hashtags)) %></span> 14 +
  15 + <%= check_box(:article, :twitter_enabled) %>
  16 + <span><%= _("Turn on TWITTER") %></span>
  17 +
  18 + <span><%= labelled_form_field(_('Twitter\'s Hashtags, comma separated (example: participa.br,participabr)'), text_field(:article, :twitter_hashtags)) %></span>
  19 +
18 <div> 20 <div>
19 <%= labelled_form_field(_('Twitter\'s consumer key'), text_field(:article, :twitter_consumer_key)) %> 21 <%= labelled_form_field(_('Twitter\'s consumer key'), text_field(:article, :twitter_consumer_key)) %>
20 - </div> 22 + </div>
21 23
22 <div> 24 <div>
23 <%= labelled_form_field(_('Twitter\'s consumer secret'), text_field(:article, :twitter_consumer_secret)) %> 25 <%= labelled_form_field(_('Twitter\'s consumer secret'), text_field(:article, :twitter_consumer_secret)) %>
24 - </div> 26 + </div>
25 27
26 <div> 28 <div>
27 <%= labelled_form_field(_('Twitter\'s access token'), text_field(:article, :twitter_access_token)) %> 29 <%= labelled_form_field(_('Twitter\'s access token'), text_field(:article, :twitter_access_token)) %>
28 - </div> 30 + </div>
29 31
30 <div> 32 <div>
31 <%= labelled_form_field(_('Twitter\'s access token secret'), text_field(:article, :twitter_access_token_secret)) %> 33 <%= labelled_form_field(_('Twitter\'s access token secret'), text_field(:article, :twitter_access_token_secret)) %>
32 - </div>  
33 - <br /> 34 + </div>
  35 + <br />
34 <div> 36 <div>
35 <h2><%= _('Facebook Settings:') %></h2> 37 <h2><%= _('Facebook Settings:') %></h2>
36 </div> 38 </div>
37 - <br />  
38 - <%= check_box(:article, :facebook_enabled) %> <span><%= _("Turn on FACEBOOK") %></span>  
39 - <br /><br />  
40 - <span><%= labelled_form_field(_('Facebook\'s hashtag (example: #participabr)'), text_field(:article, :facebook_hashtag)) %></span>  
41 - <br />  
42 - <span><%= labelled_form_field(_('Facebook\'s access token'), text_field(:article, :facebook_access_token)) %></span> 39 +
  40 + <%= check_box(:article, :facebook_enabled) %>
  41 + <span><%= _("Turn on FACEBOOK") %></span>
  42 +
  43 + <span><%= labelled_form_field(_('Facebook\'s hashtag (example: #participabr)'), text_field(:article, :facebook_hashtag)) %></span>
  44 +
  45 + <span><%= labelled_form_field(_('Facebook\'s access token'), text_field(:article, :facebook_access_token)) %></span>
43 <br /> 46 <br />
44 <a href='https://smashballoon.com/custom-facebook-feed/access-token/' ><%= _('How to get a new access token?') %><a> 47 <a href='https://smashballoon.com/custom-facebook-feed/access-token/' ><%= _('How to get a new access token?') %><a>
45 <br /> 48 <br />
46 -</div>  
47 \ No newline at end of file 49 \ No newline at end of file
  50 +</div>
plugins/community_hub/views/content_viewer/hub.html.erb
  Diff comments   View file @ce9a334
@@ -35,10 +35,11 @@ @@ -35,10 +35,11 @@
35 :action => 'new_message', 35 :action => 'new_message',
36 :article_id => @page.id 36 :article_id => @page.id
37 } do |f| %> 37 } do |f| %>
38 - <span><%= _("Streaming") %></span> 38 + <span><%= _("Message") %>:</span>
39 <br /> 39 <br />
40 <%= f.text_area :body, :style => "width: 99%;", :cols => "38", :rows => "5", :placeholder => _("Type your message here") %> 40 <%= f.text_area :body, :style => "width: 99%;", :cols => "38", :rows => "5", :placeholder => _("Type your message here") %>
41 - <%= submit_button('add', _('Post'), :onclick => 'new_message(this); return false;') %> 41 + <%= submit_button('add', _('Send'), :onclick => 'new_message(this); return false;') %>
  42 +
42 <% end %> 43 <% end %>
43 44
44 </div> 45 </div>
@@ -75,7 +76,7 @@ @@ -75,7 +76,7 @@
75 } do |f| %> 76 } do |f| %>
76 <%= f.hidden_field :parent_id, :value => @page.id %> 77 <%= f.hidden_field :parent_id, :value => @page.id %>
77 <%= f.text_area :body, :style => "width: 100%;", :class => "mceEditor" %> 78 <%= f.text_area :body, :style => "width: 100%;", :class => "mceEditor" %>
78 - <%= submit_button('add', _('Post'), :onclick => 'new_mediation(this); return false;') %> 79 + <%= submit_button('add', _('Send'), :onclick => 'new_mediation(this); return false;') %>
79 <% end %> 80 <% end %>
80 81
81 </div> 82 </div>
script/updatepo/data/pt.upo
  Diff comments   View file @ce9a334
@@ -49,3 +49,31 @@ msgid &quot;Full screen&quot;# msgstr &quot;Tela cheia&quot; @@ -49,3 +49,31 @@ msgid &quot;Full screen&quot;# msgstr &quot;Tela cheia&quot;
49 msgid "Upload"# msgstr "Enviar" 49 msgid "Upload"# msgstr "Enviar"
50 msgid "Login with:"# msgstr "Entrar com:" 50 msgid "Login with:"# msgstr "Entrar com:"
51 msgid "Vote"# msgstr "Vote" 51 msgid "Vote"# msgstr "Vote"
  52 +msgid "Defines a hub."# msgstr "Define um hub."
  53 +msgid "HUB Settings:"# msgstr "Configurações do HUB:"
  54 +msgid "Twitter Settings:"# msgstr "Configurações do Twitter:"
  55 +msgid "Turn on TWITTER"# msgstr "Habilitar TWITTER"
  56 +msgid "Twitter's Hashtags, comma separated (example: participa.br,participabr)"# msgstr "Hashtags do Twitter, separadas por vírgula (exemplo: participa.br,participabr)"
  57 +msgid "Twitter's consumer key"# msgstr "Chave do cliente Twitter"
  58 +msgid "Twitter's consumer secret"# msgstr "Segredo do cliente Twitter"
  59 +msgid "Twitter's access token"# msgstr "Token de acesso ao Twitter"
  60 +msgid "Twitter's access token secret"# msgstr "Segredo do token de acesso ao Twitter"
  61 +msgid "Facebook Settings:"# msgstr "Configurações do Facebook"
  62 +msgid "Turn on FACEBOOK"# msgstr "Habilitar FACEBOOK"
  63 +msgid "Facebook's hashtag (example: #participabr)"# msgstr "Hashtag do Facebook (exemplo: #participabr)"
  64 +msgid "Facebook's access token"# msgstr "Token de acesso ao Facebook"
  65 +msgid "How to get a new access token?"# msgstr "Como obter um novo token de acesso?"
  66 +msgid "User not promoted"# msgstr "Usuário não promovido"
  67 +msgid "User promoted"# msgstr "Usuário promovido"
  68 +msgid "Message pinned"# msgstr "Mensagem fixada"
  69 +msgid "Type your comment here"# msgstr "Escreva seu comentário aqui"
  70 +msgid "Post"# msgstr "Postagem"
  71 +msgid "Pin message"# msgstr "Fixar mensagem"
  72 +msgid "BANNER SPACE"# msgstr "Espaço para propaganda"
  73 +msgid "General settings"# msgstr "Configurações gerais"
  74 +msgid "Live"# msgstr "Ao vivo"
  75 +msgid "Mediation"# msgstr "Mediação"
  76 +msgid "Auto scrolling"# msgstr "Rolagem automática"
  77 +msgid "Type your message here"# msgstr "Escreva sua mensagem aqui"
  78 +msgid "Are you sure that you want to pin this message?"# msgstr "Tem certeza que quer fixar esta mensagem?"
  79 +msgid "Are you sure that you want to promote this user?"# msgstr "Tem certeza que quer promover este usuário?"