Download as
Browse Code »

Commit 243ecd040e371f4513eb20ebd69eacf0c9586d2a

Authored by Antonio Terceiro
2 parents 4422e213 6e11fc41
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Merge branch 'stable' 

Conflicts:

	po/de/noosfero.po
	po/pt/noosfero.po
Showing 26 changed files with 215 additions and 125 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @243ecd0
... ... @@ -57,7 +57,6 @@ class AccountController < ApplicationController
57 57 @terms_of_use = environment.terms_of_use
58 58 @user.person_data = params[:profile_data]
59 59 @person = Person.new(params[:profile_data])
60   - @person.name = @user.login
61 60 @person.environment = @user.environment
62 61 if request.post? && params[self.icaptcha_field].blank?
63 62 @user.signup!
... ...
app/helpers/boxes_helper.rb
  Diff comments   View file @243ecd0
... ... @@ -206,7 +206,7 @@ module BoxesHelper
206 206 end
207 207  
208 208 if block.respond_to?(:help)
209   - buttons << thickbox_inline_popup_icon(:help, _('Help on this block'), "help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help, :style => 'margin-bottom: 1em;') + thickbox_close_button(_('Close')), :style => 'display: none;', :id => "help-on-box-#{block.id}")
  209 + buttons << thickbox_inline_popup_icon(:help, _('Help on this block'), {}, "help-on-box-#{block.id}") << content_tag('div', content_tag('h2', _('Help')) + content_tag('div', block.help, :style => 'margin-bottom: 1em;') + thickbox_close_button(_('Close')), :style => 'display: none;', :id => "help-on-box-#{block.id}")
210 210 end
211 211  
212 212 content_tag('div', buttons.join("\n") + tag('br', :style => 'clear: left'), :class => 'button-bar')
... ...
app/helpers/thickbox_helper.rb
  Diff comments   View file @243ecd0
1 1 module ThickboxHelper
2   - def thickbox_inline_popup_link(title, id, options = {})
3   - link_to(title, "#TB_inline?height=300&width=500&inlineId=#{id}&modal=true", {:class => 'thickbox'}.merge(options))
  2 + def thickbox_inline_popup_link(title, url, id, options = {})
  3 + link_to(title, url_for(url) + "#TB_inline?height=300&width=500&inlineId=#{id}&modal=true", {:class => 'thickbox'}.merge(options))
4 4 end
5   - def thickbox_inline_popup_icon(type, title, id, options = {})
6   - icon_button(type, title, "#TB_inline?height=300&width=500&inlineId=#{id}&modal=true", {:class => "thickbox"}.merge(options))
  5 + def thickbox_inline_popup_icon(type, title, url, id, options = {})
  6 + icon_button(type, title, url_for(url) + "#TB_inline?height=300&width=500&inlineId=#{id}&modal=true", {:class => "thickbox"}.merge(options))
7 7 end
8 8 def thickbox_close_button(title)
9 9 button_to_function(:close, title, 'tb_remove();')
... ...
app/models/comment.rb
  Diff comments   View file @243ecd0
... ... @@ -17,7 +17,7 @@ class Comment &lt; ActiveRecord::Base
17 17 end
18 18 end
19 19  
20   - xss_terminate :only => [ :body, :title ]
  20 + xss_terminate :only => [ :body, :title, :name ]
21 21  
22 22 def author_name
23 23 if author
... ...
app/models/feed_reader_block.rb
  Diff comments   View file @243ecd0
... ... @@ -69,6 +69,7 @@ class FeedReaderBlock &lt; Block
69 69 def clear
70 70 self.feed_items = []
71 71 self.feed_title = nil
  72 + self.error_message = nil
72 73 end
73 74 def finish_fetch
74 75 self.fetched_at = Time.now
... ...
app/models/google_maps.rb
  Diff comments   View file @243ecd0
... ... @@ -15,11 +15,13 @@ class GoogleMaps
15 15 end
16 16  
17 17 def enabled?(domain)
18   - !Domain.find_by_name(domain).google_maps_key.nil?
  18 + domain = Domain.find_by_name(domain)
  19 + domain ? !domain.google_maps_key.nil? : false
19 20 end
20 21  
21   - def key(domain)
22   - Domain.find_by_name(domain).google_maps_key || ''
  22 + def key(domainname)
  23 + domain = Domain.find_by_name(domainname)
  24 + domain && domain.google_maps_key || ''
23 25 end
24 26  
25 27 def initial_zoom
... ...
app/models/person.rb
  Diff comments   View file @243ecd0
... ... @@ -184,14 +184,6 @@ class Person &lt; Profile
184 184 ]
185 185 end
186 186  
187   - def name
188   - if !self[:name].blank?
189   - self[:name]
190   - else
191   - self.user ? self.user.login : nil
192   - end
193   - end
194   -
195 187 has_and_belongs_to_many :favorite_enterprises, :class_name => 'Enterprise', :join_table => 'favorite_enteprises_people'
196 188  
197 189 def email_domain
... ...
app/views/cms/view.rhtml
  Diff comments   View file @243ecd0
... ... @@ -36,9 +36,9 @@
36 36 <td>
37 37 <%= image_tag 'icons-mime/gnome-folder.png' %>
38 38 <% if @article.parent %>
39   - <%= link_to '.. (parent folder)', :action => 'view', :id => @article.parent.id %>
  39 + <%= link_to '.. (' + _('parent folder') + ')', :action => 'view', :id => @article.parent.id %>
40 40 <% else %>
41   - <%= link_to '.. (parent folder)', :action => 'index' %>
  41 + <%= link_to '.. (' + _('parent folder') + ')', :action => 'index' %>
42 42 <% end %>
43 43 </td>
44 44 <td><%= Folder.short_description %></td>
... ...
app/views/layouts/application-ng.rhtml
  Diff comments   View file @243ecd0
... ... @@ -67,7 +67,7 @@
67 67 <% end %>
68 68 <%= link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) %>
69 69 <% else %>
70   - <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
  70 + <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
71 71 <div id='inlineLoginBox' style='display: none;'>
72 72 <%= render :file => 'account/login' %>
73 73 <center><%= thickbox_close_button _('Close') %></center>
... ...
app/views/profile_editor/_person_form.rhtml
  Diff comments   View file @243ecd0
1 1 <% @person ||= @profile %>
2 2  
3   -<%= required labelled_form_field(_('Full name'), text_field(:profile_data, :name)) %>
  3 +<%= required f.text_field(:name) %>
4 4  
5 5 <% optional_field(@person, 'nickname') do %>
6 6 <%= f.text_field(:nickname, :maxlength => 16, :size => 30) %>
... ...
app/views/shared/user_menu.rhtml
  Diff comments   View file @243ecd0
... ... @@ -62,7 +62,7 @@
62 62 <% if theme_option( :menu_login ) == 'full_form' %>
63 63 <%= render :file => 'account/login_block' %>
64 64 <% else %>
65   - <%= thickbox_inline_popup_link('<span class="icon-menu-login"></span>'+ _('Login'), 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')) %>
  65 + <%= thickbox_inline_popup_link('<span class="icon-menu-login"></span>'+ _('Login'), login_url, 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')) %>
66 66 <div id='inlineLoginBox' style='display: none;'>
67 67 <%= render :file => 'account/login' %>
68 68 <center><%= thickbox_close_button _('Close') %></center>
... ...
db/migrate/079_fix_people_without_names.rb 0 → 100644
  Diff comments   View file @243ecd0
... ... @@ -0,0 +1,11 @@
  1 +class FixPeopleWithoutNames < ActiveRecord::Migration
  2 + def self.up
  3 + select_all("SELECT name, identifier FROM profiles WHERE name = '' or name IS NULL").each do |profile|
  4 + update("UPDATE profiles SET name = '%s' WHERE identifier = '%s'" % [profile['identifier'], profile['identifier']])
  5 + end
  6 + end
  7 +
  8 + def self.down
  9 + say("Nothing to undo (cannot recover the data)")
  10 + end
  11 +end
... ...
features/join_community.feature
  Diff comments   View file @243ecd0
... ... @@ -53,7 +53,7 @@ Feature: join a community
53 53 | Username | joseoliveira |
54 54 | Password | 123456 |
55 55 | Password confirmation | 123456 |
56   - | Full name | Jose Oliveira |
  56 + | Name | Jose Oliveira |
57 57 And I press "Sign up"
58 58 And I should see "Are you sure you want to join Sample Community?"
59 59 When I press "Yes, I want to join"
... ...
features/signup.feature
  Diff comments   View file @243ecd0
... ... @@ -11,7 +11,7 @@ Feature: signup
11 11 And I fill in "Username" with "josesilva"
12 12 And I fill in "Password" with "secret"
13 13 And I fill in "Password confirmation" with "secret"
14   - And I fill in "Full name" with "José da Silva"
  14 + And I fill in "Name" with "José da Silva"
15 15 And I press "Sign up"
16 16 Then I should see "Thanks for signing up!"
17 17  
... ... @@ -22,3 +22,25 @@ Feature: signup
22 22 Given I am logged in as "joaosilva"
23 23 And I go to signup page
24 24 Then I should be on Joao Silva's control panel
  25 +
  26 + Scenario: user cannot register without a name
  27 + Given I am on the homepage
  28 + And I follow "Login"
  29 + And I follow "I want to participate"
  30 + And I fill in "e-Mail" with "josesilva@example.com"
  31 + And I fill in "Username" with "josesilva"
  32 + And I fill in "Password" with "secret"
  33 + And I fill in "Password confirmation" with "secret"
  34 + And I press "Sign up"
  35 + Then I should see "Name can't be blank"
  36 +
  37 + Scenario: user cannot change his name to empty string
  38 + Given the following users
  39 + | login | name |
  40 + | joaosilva | Joao Silva |
  41 + Given I am logged in as "joaosilva"
  42 + And I am on Joao Silva's control panel
  43 + And I follow "Profile Info and settings"
  44 + And I fill in "Name" with ""
  45 + When I press "Save"
  46 + Then I should see "Name can't be blank"
... ...
lib/noosfero.rb
  Diff comments   View file @243ecd0
1 1 module Noosfero
2 2 PROJECT = 'noosfero'
3   - VERSION = '0.21.3'
  3 + VERSION = '0.21.4'
4 4  
5 5 def self.pattern_for_controllers_in_directory(dir)
6 6 disjunction = controllers_in_directory(dir).join('|')
... ...
po/de/noosfero.po
  Diff comments   View file @243ecd0
... ... @@ -6,9 +6,9 @@
6 6 #
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.21.0\n"
10   -"POT-Creation-Date: 2009-12-11 16:30-0300\n"
11   -"PO-Revision-Date: 2010-01-13 14:40-0300\n"
  9 +"Project-Id-Version: noosfero 0.21.3\n"
  10 +"POT-Creation-Date: 2010-01-13 13:04-0300\n"
  11 +"PO-Revision-Date: 2010-01-20 13:44-0300\n"
12 12 "Last-Translator: Ronny Kursawe <kursawe.ronny@googlemail.com>\n"
13 13 "Language-Team: German <de@li.org>\n"
14 14 "MIME-Version: 1.0\n"
... ... @@ -1157,40 +1157,40 @@ msgstr &quot;Community-Felder nicht erfolgreich aktualisiert&quot;
1157 1157 msgid "You are not allowed to view this content. You can contact the owner of this profile to request access then."
1158 1158 msgstr "Es ist Ihnen nicht erlaubt diesen Inhalt anzusehen. Sie können den Besitzer dieses Profiles kontaktieren und um Erlaubnis fragen."
1159 1159  
1160   -#: app/controllers/public/content_viewer_controller.rb:112
  1160 +#: app/controllers/public/content_viewer_controller.rb:115
1161 1161 msgid "Comment succesfully deleted"
1162 1162 msgstr "Kommentar erfolgreich gelöscht"
1163 1163  
1164   -#: app/controllers/public/account_controller.rb:30
  1164 +#: app/controllers/public/account_controller.rb:31
1165 1165 msgid "Logged in successfully"
1166 1166 msgstr "Erfolgreich angemeldet"
1167 1167  
1168   -#: app/controllers/public/account_controller.rb:33
  1168 +#: app/controllers/public/account_controller.rb:34
1169 1169 msgid "Incorrect username or password"
1170 1170 msgstr "Falscher User-Name oder falsches Passwort"
1171 1171  
1172   -#: app/controllers/public/account_controller.rb:71
  1172 +#: app/controllers/public/account_controller.rb:72
1173 1173 #, fuzzy
1174 1174 msgid "Thanks for signing up!"
1175 1175 msgstr "Vielen Dank!"
1176 1176  
1177   -#: app/controllers/public/account_controller.rb:110
  1177 +#: app/controllers/public/account_controller.rb:111
1178 1178 msgid "You have been logged out."
1179 1179 msgstr "Sie haben sich abgemeldet."
1180 1180  
1181   -#: app/controllers/public/account_controller.rb:121
  1181 +#: app/controllers/public/account_controller.rb:122
1182 1182 msgid "Your password has been changed successfully!"
1183 1183 msgstr "Ihr Passwort wurde erfolgreich geändert!"
1184 1184  
1185   -#: app/controllers/public/account_controller.rb:124
  1185 +#: app/controllers/public/account_controller.rb:125
1186 1186 msgid "The supplied current password is incorrect."
1187 1187 msgstr "Das übermittelte aktuelle Passwort ist falsch."
1188 1188  
1189   -#: app/controllers/public/account_controller.rb:226
  1189 +#: app/controllers/public/account_controller.rb:227
1190 1190 msgid "Available!"
1191 1191 msgstr "Verfügbar!"
1192 1192  
1193   -#: app/controllers/public/account_controller.rb:229
  1193 +#: app/controllers/public/account_controller.rb:230
1194 1194 msgid "Unavailable!"
1195 1195 msgstr "Nicht verfügbar!"
1196 1196  
... ... @@ -2229,14 +2229,17 @@ msgstr &quot;Tags werden erstellt, wenn Sie diese ihrem Inhalt hinzufügen. &lt;p/&gt; &quot;
2229 2229 msgid "tags|View all"
2230 2230 msgstr "Tags|zeige alle"
2231 2231  
2232   -#: app/models/add_friend.rb:21
2233   -#: app/models/invite_friend.rb:45
  2232 +#: app/models/add_friend.rb:23 app/models/invite_friend.rb:45
2234 2233 msgid "%s wants to be your friend."
2235 2234 msgstr "%s möchte Ihr Freund werden."
2236 2235  
2237   -#: app/models/add_friend.rb:30
2238   -msgid "You need to login to %{system} in order to accept %{requestor} as your friend."
2239   -msgstr "Sie müssen bei %{system} angemeldet sein, um %{requestor} alsIhren Freund zu akzeptieren."
  2236 +#: app/models/add_friend.rb:32
  2237 +msgid ""
  2238 +"You need to login to %{system} in order to accept %{requestor} as your "
  2239 +"friend."
  2240 +msgstr ""
  2241 +"Sie müssen bei %{system} angemeldet sein, um %{requestor} alsIhren Freund zu "
  2242 +"akzeptieren."
2240 2243  
2241 2244 #: app/models/friends_block.rb:4
2242 2245 msgid "A block that displays your friends"
... ... @@ -3043,6 +3046,10 @@ msgstr &quot;bestätigt&quot;
3043 3046 msgid "domain"
3044 3047 msgstr "domain"
3045 3048  
  3049 +#: app/models/domain.rb:-
  3050 +msgid "Google maps key"
  3051 +msgstr ""
  3052 +
3046 3053 #: app/models/domain.rb:13
3047 3054 msgid "%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9) and \"_\""
3048 3055 msgstr "%{fn} darf nur kleine Buchstaben (a to z) und Zahlen (0 to 9) enthalten"
... ... @@ -3542,6 +3549,11 @@ msgstr &quot;Aktueller Ordner:&quot;
3542 3549 msgid "Actions"
3543 3550 msgstr "Aktionen"
3544 3551  
  3552 +#: app/views/cms/view.rhtml:39 app/views/cms/view.rhtml:41
  3553 +#, fuzzy
  3554 +msgid "parent folder"
  3555 +msgstr "Aktueller Ordner:"
  3556 +
3545 3557 #: app/views/cms/view.rhtml:60
3546 3558 msgid "Properties"
3547 3559 msgstr "Eigenschaften"
... ...
po/fr/noosfero.po
  Diff comments   View file @243ecd0
... ... @@ -4,9 +4,9 @@
4 4 # , 2009.
5 5 msgid ""
6 6 msgstr ""
7   -"Project-Id-Version: noosfero 0.21.0\n"
  7 +"Project-Id-Version: noosfero 0.21.3\n"
8 8 "Report-Msgid-Bugs-To: \n"
9   -"POT-Creation-Date: 2009-12-11 16:30-0300\n"
  9 +"POT-Creation-Date: 2010-01-13 13:04-0300\n"
10 10 "PO-Revision-Date: 2009-12-04 18:46-0300\n"
11 11 "Last-Translator: Jean-Claude Bulliard <jcb@bulliard-consulting.com>\n"
12 12 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
... ... @@ -1144,39 +1144,39 @@ msgstr &quot;&quot;
1144 1144 "Vous n'êtes pas autorisé(e) à voir ce contenu. Vous pouvez contacter son "
1145 1145 "propriétaire pour lui en demander l'accès. "
1146 1146  
1147   -#: app/controllers/public/content_viewer_controller.rb:112
  1147 +#: app/controllers/public/content_viewer_controller.rb:115
1148 1148 msgid "Comment succesfully deleted"
1149 1149 msgstr "Le commentaire a bien été effacé"
1150 1150  
1151   -#: app/controllers/public/account_controller.rb:30
  1151 +#: app/controllers/public/account_controller.rb:31
1152 1152 msgid "Logged in successfully"
1153 1153 msgstr "Connexion réussie"
1154 1154  
1155   -#: app/controllers/public/account_controller.rb:33
  1155 +#: app/controllers/public/account_controller.rb:34
1156 1156 msgid "Incorrect username or password"
1157 1157 msgstr "Identifiant ou mot de passe incorrect"
1158 1158  
1159   -#: app/controllers/public/account_controller.rb:71
  1159 +#: app/controllers/public/account_controller.rb:72
1160 1160 msgid "Thanks for signing up!"
1161 1161 msgstr "Merci de vous être inscrit(e) !"
1162 1162  
1163   -#: app/controllers/public/account_controller.rb:110
  1163 +#: app/controllers/public/account_controller.rb:111
1164 1164 msgid "You have been logged out."
1165 1165 msgstr "Vous avez été déconnecté(e)."
1166 1166  
1167   -#: app/controllers/public/account_controller.rb:121
  1167 +#: app/controllers/public/account_controller.rb:122
1168 1168 msgid "Your password has been changed successfully!"
1169 1169 msgstr "Votre mot de passe a bien été modifié !"
1170 1170  
1171   -#: app/controllers/public/account_controller.rb:124
  1171 +#: app/controllers/public/account_controller.rb:125
1172 1172 msgid "The supplied current password is incorrect."
1173 1173 msgstr "Le mot de passe actuel fourni est incorrect."
1174 1174  
1175   -#: app/controllers/public/account_controller.rb:226
  1175 +#: app/controllers/public/account_controller.rb:227
1176 1176 msgid "Available!"
1177 1177 msgstr "Disponible !"
1178 1178  
1179   -#: app/controllers/public/account_controller.rb:229
  1179 +#: app/controllers/public/account_controller.rb:230
1180 1180 msgid "Unavailable!"
1181 1181 msgstr "Indisponible"
1182 1182  
... ... @@ -2222,11 +2222,11 @@ msgstr &quot;&quot;
2222 2222 msgid "tags|View all"
2223 2223 msgstr "Voir tout"
2224 2224  
2225   -#: app/models/add_friend.rb:21 app/models/invite_friend.rb:45
  2225 +#: app/models/add_friend.rb:23 app/models/invite_friend.rb:45
2226 2226 msgid "%s wants to be your friend."
2227 2227 msgstr "%s veut être votre contact."
2228 2228  
2229   -#: app/models/add_friend.rb:30
  2229 +#: app/models/add_friend.rb:32
2230 2230 msgid ""
2231 2231 "You need to login to %{system} in order to accept %{requestor} as your "
2232 2232 "friend."
... ... @@ -3085,6 +3085,10 @@ msgstr &quot;Validé(e)&quot;
3085 3085 msgid "domain"
3086 3086 msgstr "domaine"
3087 3087  
  3088 +#: app/models/domain.rb:-
  3089 +msgid "Google maps key"
  3090 +msgstr ""
  3091 +
3088 3092 #: app/models/domain.rb:13
3089 3093 msgid ""
3090 3094 "%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9) "
... ... @@ -3607,6 +3611,11 @@ msgstr &quot;Catégorie courante :&quot;
3607 3611 msgid "Actions"
3608 3612 msgstr "Actions"
3609 3613  
  3614 +#: app/views/cms/view.rhtml:39 app/views/cms/view.rhtml:41
  3615 +#, fuzzy
  3616 +msgid "parent folder"
  3617 +msgstr "Catégorie courante :"
  3618 +
3610 3619 #: app/views/cms/view.rhtml:60
3611 3620 msgid "Properties"
3612 3621 msgstr "Propriétés"
... ...
po/hy/noosfero.po
  Diff comments   View file @243ecd0
... ... @@ -5,8 +5,8 @@
5 5 #
6 6 msgid ""
7 7 msgstr ""
8   -"Project-Id-Version: noosfero 0.21.0\n"
9   -"POT-Creation-Date: 2009-12-11 16:30-0300\n"
  8 +"Project-Id-Version: noosfero 0.21.3\n"
  9 +"POT-Creation-Date: 2010-01-13 13:04-0300\n"
10 10 "PO-Revision-Date: 2009-10-26 16:20-0300\n"
11 11 "Last-Translator: Anahit Minassian <anahit.minassian@cooperation.net>\n"
12 12 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -1132,39 +1132,39 @@ msgid &quot;&quot;
1132 1132 "profile to request access then."
1133 1133 msgstr ""
1134 1134  
1135   -#: app/controllers/public/content_viewer_controller.rb:112
  1135 +#: app/controllers/public/content_viewer_controller.rb:115
1136 1136 msgid "Comment succesfully deleted"
1137 1137 msgstr "Մեկնաբանությունը հաջողությամբ հեռացված է:"
1138 1138  
1139   -#: app/controllers/public/account_controller.rb:30
  1139 +#: app/controllers/public/account_controller.rb:31
1140 1140 msgid "Logged in successfully"
1141 1141 msgstr "Հաջողությամբ մուտք եք գործել"
1142 1142  
1143   -#: app/controllers/public/account_controller.rb:33
  1143 +#: app/controllers/public/account_controller.rb:34
1144 1144 msgid "Incorrect username or password"
1145 1145 msgstr "Մասնակցի սխալ անուն կամ սխալ գաղտնաբառ"
1146 1146  
1147   -#: app/controllers/public/account_controller.rb:71
  1147 +#: app/controllers/public/account_controller.rb:72
1148 1148 msgid "Thanks for signing up!"
1149 1149 msgstr "Շնորհակալություն գրանցվելու համար:"
1150 1150  
1151   -#: app/controllers/public/account_controller.rb:110
  1151 +#: app/controllers/public/account_controller.rb:111
1152 1152 msgid "You have been logged out."
1153 1153 msgstr "Դուք համակարգից դուրս եք եկել:"
1154 1154  
1155   -#: app/controllers/public/account_controller.rb:121
  1155 +#: app/controllers/public/account_controller.rb:122
1156 1156 msgid "Your password has been changed successfully!"
1157 1157 msgstr "Ձեր գաղտնաբառը բարեհաջող փոխված է:"
1158 1158  
1159   -#: app/controllers/public/account_controller.rb:124
  1159 +#: app/controllers/public/account_controller.rb:125
1160 1160 msgid "The supplied current password is incorrect."
1161 1161 msgstr "Ներկայիս գաղտաբառը սխալ է:"
1162 1162  
1163   -#: app/controllers/public/account_controller.rb:226
  1163 +#: app/controllers/public/account_controller.rb:227
1164 1164 msgid "Available!"
1165 1165 msgstr ""
1166 1166  
1167   -#: app/controllers/public/account_controller.rb:229
  1167 +#: app/controllers/public/account_controller.rb:230
1168 1168 msgid "Unavailable!"
1169 1169 msgstr ""
1170 1170  
... ... @@ -2181,11 +2181,11 @@ msgstr &quot;&quot;
2181 2181 msgid "tags|View all"
2182 2182 msgstr "Տեսնել բոլորին"
2183 2183  
2184   -#: app/models/add_friend.rb:21 app/models/invite_friend.rb:45
  2184 +#: app/models/add_friend.rb:23 app/models/invite_friend.rb:45
2185 2185 msgid "%s wants to be your friend."
2186 2186 msgstr ""
2187 2187  
2188   -#: app/models/add_friend.rb:30
  2188 +#: app/models/add_friend.rb:32
2189 2189 msgid ""
2190 2190 "You need to login to %{system} in order to accept %{requestor} as your "
2191 2191 "friend."
... ... @@ -3024,6 +3024,10 @@ msgstr &quot;Վավերացված է&quot;
3024 3024 msgid "domain"
3025 3025 msgstr "տիրույթ"
3026 3026  
  3027 +#: app/models/domain.rb:-
  3028 +msgid "Google maps key"
  3029 +msgstr ""
  3030 +
3027 3031 #: app/models/domain.rb:13
3028 3032 msgid ""
3029 3033 "%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9) "
... ... @@ -3536,6 +3540,11 @@ msgstr &quot;Ներկայիս կատեգորիա&quot;
3536 3540 msgid "Actions"
3537 3541 msgstr "Գործողություններ"
3538 3542  
  3543 +#: app/views/cms/view.rhtml:39 app/views/cms/view.rhtml:41
  3544 +#, fuzzy
  3545 +msgid "parent folder"
  3546 +msgstr "Ներկայիս կատեգորիա"
  3547 +
3539 3548 #: app/views/cms/view.rhtml:60
3540 3549 msgid "Properties"
3541 3550 msgstr "Հատկություններ"
... ...
po/noosfero.pot
  Diff comments   View file @243ecd0
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.21.0\n"
10   -"POT-Creation-Date: 2009-12-11 16:30-0300\n"
  9 +"Project-Id-Version: noosfero 0.21.3\n"
  10 +"POT-Creation-Date: 2010-01-13 13:04-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -1115,39 +1115,39 @@ msgid &quot;&quot;
1115 1115 "profile to request access then."
1116 1116 msgstr ""
1117 1117  
1118   -#: app/controllers/public/content_viewer_controller.rb:112
  1118 +#: app/controllers/public/content_viewer_controller.rb:115
1119 1119 msgid "Comment succesfully deleted"
1120 1120 msgstr ""
1121 1121  
1122   -#: app/controllers/public/account_controller.rb:30
  1122 +#: app/controllers/public/account_controller.rb:31
1123 1123 msgid "Logged in successfully"
1124 1124 msgstr ""
1125 1125  
1126   -#: app/controllers/public/account_controller.rb:33
  1126 +#: app/controllers/public/account_controller.rb:34
1127 1127 msgid "Incorrect username or password"
1128 1128 msgstr ""
1129 1129  
1130   -#: app/controllers/public/account_controller.rb:71
  1130 +#: app/controllers/public/account_controller.rb:72
1131 1131 msgid "Thanks for signing up!"
1132 1132 msgstr ""
1133 1133  
1134   -#: app/controllers/public/account_controller.rb:110
  1134 +#: app/controllers/public/account_controller.rb:111
1135 1135 msgid "You have been logged out."
1136 1136 msgstr ""
1137 1137  
1138   -#: app/controllers/public/account_controller.rb:121
  1138 +#: app/controllers/public/account_controller.rb:122
1139 1139 msgid "Your password has been changed successfully!"
1140 1140 msgstr ""
1141 1141  
1142   -#: app/controllers/public/account_controller.rb:124
  1142 +#: app/controllers/public/account_controller.rb:125
1143 1143 msgid "The supplied current password is incorrect."
1144 1144 msgstr ""
1145 1145  
1146   -#: app/controllers/public/account_controller.rb:226
  1146 +#: app/controllers/public/account_controller.rb:227
1147 1147 msgid "Available!"
1148 1148 msgstr ""
1149 1149  
1150   -#: app/controllers/public/account_controller.rb:229
  1150 +#: app/controllers/public/account_controller.rb:230
1151 1151 msgid "Unavailable!"
1152 1152 msgstr ""
1153 1153  
... ... @@ -2121,11 +2121,11 @@ msgstr &quot;&quot;
2121 2121 msgid "tags|View all"
2122 2122 msgstr ""
2123 2123  
2124   -#: app/models/add_friend.rb:21 app/models/invite_friend.rb:45
  2124 +#: app/models/add_friend.rb:23 app/models/invite_friend.rb:45
2125 2125 msgid "%s wants to be your friend."
2126 2126 msgstr ""
2127 2127  
2128   -#: app/models/add_friend.rb:30
  2128 +#: app/models/add_friend.rb:32
2129 2129 msgid ""
2130 2130 "You need to login to %{system} in order to accept %{requestor} as your "
2131 2131 "friend."
... ... @@ -2925,6 +2925,10 @@ msgstr &quot;&quot;
2925 2925 msgid "domain"
2926 2926 msgstr ""
2927 2927  
  2928 +#: app/models/domain.rb:-
  2929 +msgid "Google maps key"
  2930 +msgstr ""
  2931 +
2928 2932 #: app/models/domain.rb:13
2929 2933 msgid ""
2930 2934 "%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9) "
... ... @@ -3418,6 +3422,10 @@ msgstr &quot;&quot;
3418 3422 msgid "Actions"
3419 3423 msgstr ""
3420 3424  
  3425 +#: app/views/cms/view.rhtml:39 app/views/cms/view.rhtml:41
  3426 +msgid "parent folder"
  3427 +msgstr ""
  3428 +
3421 3429 #: app/views/cms/view.rhtml:60
3422 3430 msgid "Properties"
3423 3431 msgstr ""
... ...
po/pt/noosfero.po
  Diff comments   View file @243ecd0
... ... @@ -11,9 +11,9 @@
11 11 #
12 12 msgid ""
13 13 msgstr ""
14   -"Project-Id-Version: noosfero 0.21.0\n"
15   -"POT-Creation-Date: 2009-12-11 16:30-0300\n"
16   -"PO-Revision-Date: 2009-12-28 19:12-0300\n"
  14 +"Project-Id-Version: noosfero 0.21.3\n"
  15 +"POT-Creation-Date: 2010-01-13 13:04-0300\n"
  16 +"PO-Revision-Date: 2010-01-20 13:44-0300\n"
17 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 18 "Language-Team: LANGUAGE <LL@li.org>\n"
19 19 "MIME-Version: 1.0\n"
... ... @@ -1127,39 +1127,39 @@ msgstr &quot;&quot;
1127 1127 "Você não tem permissão de visualizar este conteúdo. Você pode contactar o "
1128 1128 "dono deste perfil e pedir acesso."
1129 1129  
1130   -#: app/controllers/public/content_viewer_controller.rb:112
  1130 +#: app/controllers/public/content_viewer_controller.rb:115
1131 1131 msgid "Comment succesfully deleted"
1132 1132 msgstr "Comentário removido com sucesso"
1133 1133  
1134   -#: app/controllers/public/account_controller.rb:30
  1134 +#: app/controllers/public/account_controller.rb:31
1135 1135 msgid "Logged in successfully"
1136 1136 msgstr "Login bem sucedido"
1137 1137  
1138   -#: app/controllers/public/account_controller.rb:33
  1138 +#: app/controllers/public/account_controller.rb:34
1139 1139 msgid "Incorrect username or password"
1140 1140 msgstr "Nome ou senha incorreto"
1141 1141  
1142   -#: app/controllers/public/account_controller.rb:71
  1142 +#: app/controllers/public/account_controller.rb:72
1143 1143 msgid "Thanks for signing up!"
1144 1144 msgstr "Obrigado por se registrar!"
1145 1145  
1146   -#: app/controllers/public/account_controller.rb:110
  1146 +#: app/controllers/public/account_controller.rb:111
1147 1147 msgid "You have been logged out."
1148 1148 msgstr "Você saiu do sistema."
1149 1149  
1150   -#: app/controllers/public/account_controller.rb:121
  1150 +#: app/controllers/public/account_controller.rb:122
1151 1151 msgid "Your password has been changed successfully!"
1152 1152 msgstr "Sua senha foi alterada com sucesso!"
1153 1153  
1154   -#: app/controllers/public/account_controller.rb:124
  1154 +#: app/controllers/public/account_controller.rb:125
1155 1155 msgid "The supplied current password is incorrect."
1156 1156 msgstr "A senha informada está incorreta"
1157 1157  
1158   -#: app/controllers/public/account_controller.rb:226
  1158 +#: app/controllers/public/account_controller.rb:227
1159 1159 msgid "Available!"
1160 1160 msgstr "Disponível!"
1161 1161  
1162   -#: app/controllers/public/account_controller.rb:229
  1162 +#: app/controllers/public/account_controller.rb:230
1163 1163 msgid "Unavailable!"
1164 1164 msgstr "Não disponível!"
1165 1165  
... ... @@ -2168,11 +2168,11 @@ msgstr &quot;&quot;
2168 2168 msgid "tags|View all"
2169 2169 msgstr "Ver todos(as)"
2170 2170  
2171   -#: app/models/add_friend.rb:21 app/models/invite_friend.rb:45
  2171 +#: app/models/add_friend.rb:23 app/models/invite_friend.rb:45
2172 2172 msgid "%s wants to be your friend."
2173 2173 msgstr "%s quer ser seu(sua) amigo(a)."
2174 2174  
2175   -#: app/models/add_friend.rb:30
  2175 +#: app/models/add_friend.rb:32
2176 2176 msgid ""
2177 2177 "You need to login to %{system} in order to accept %{requestor} as your "
2178 2178 "friend."
... ... @@ -2999,6 +2999,10 @@ msgstr &quot;Validado&quot;
2999 2999 msgid "domain"
3000 3000 msgstr "domínio"
3001 3001  
  3002 +#: app/models/domain.rb:-
  3003 +msgid "Google maps key"
  3004 +msgstr ""
  3005 +
3002 3006 #: app/models/domain.rb:13
3003 3007 msgid ""
3004 3008 "%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9) "
... ... @@ -3513,6 +3517,10 @@ msgstr &quot;Pasta atual:&quot;
3513 3517 msgid "Actions"
3514 3518 msgstr "Ações"
3515 3519  
  3520 +#: app/views/cms/view.rhtml:39 app/views/cms/view.rhtml:41
  3521 +msgid "parent folder"
  3522 +msgstr "pasta superior"
  3523 +
3516 3524 #: app/views/cms/view.rhtml:60
3517 3525 msgid "Properties"
3518 3526 msgstr "Características"
... ...
po/ru/noosfero.po
  Diff comments   View file @243ecd0
... ... @@ -5,8 +5,8 @@
5 5 #
6 6 msgid ""
7 7 msgstr ""
8   -"Project-Id-Version: noosfero 0.21.0\n"
9   -"POT-Creation-Date: 2009-12-11 16:30-0300\n"
  8 +"Project-Id-Version: noosfero 0.21.3\n"
  9 +"POT-Creation-Date: 2010-01-13 13:04-0300\n"
10 10 "PO-Revision-Date: 2009-10-09 13:28+0100\n"
11 11 "Last-Translator: Anton <anton.c@live.com>\n"
12 12 "Language-Team: German <de@li.org>\n"
... ... @@ -1120,39 +1120,39 @@ msgid &quot;&quot;
1120 1120 "profile to request access then."
1121 1121 msgstr "Вы не можете просматривать данный контент. Обратитесь к автору."
1122 1122  
1123   -#: app/controllers/public/content_viewer_controller.rb:112
  1123 +#: app/controllers/public/content_viewer_controller.rb:115
1124 1124 msgid "Comment succesfully deleted"
1125 1125 msgstr "Комментарий успешно удален"
1126 1126  
1127   -#: app/controllers/public/account_controller.rb:30
  1127 +#: app/controllers/public/account_controller.rb:31
1128 1128 msgid "Logged in successfully"
1129 1129 msgstr "Успешный логин"
1130 1130  
1131   -#: app/controllers/public/account_controller.rb:33
  1131 +#: app/controllers/public/account_controller.rb:34
1132 1132 msgid "Incorrect username or password"
1133 1133 msgstr "Неправильное имя или пароль"
1134 1134  
1135   -#: app/controllers/public/account_controller.rb:71
  1135 +#: app/controllers/public/account_controller.rb:72
1136 1136 msgid "Thanks for signing up!"
1137 1137 msgstr "Спасибо за регистрацию!"
1138 1138  
1139   -#: app/controllers/public/account_controller.rb:110
  1139 +#: app/controllers/public/account_controller.rb:111
1140 1140 msgid "You have been logged out."
1141 1141 msgstr "Вы произвели выход"
1142 1142  
1143   -#: app/controllers/public/account_controller.rb:121
  1143 +#: app/controllers/public/account_controller.rb:122
1144 1144 msgid "Your password has been changed successfully!"
1145 1145 msgstr "Ваш пароль успешно изменен"
1146 1146  
1147   -#: app/controllers/public/account_controller.rb:124
  1147 +#: app/controllers/public/account_controller.rb:125
1148 1148 msgid "The supplied current password is incorrect."
1149 1149 msgstr "Пароль неверный"
1150 1150  
1151   -#: app/controllers/public/account_controller.rb:226
  1151 +#: app/controllers/public/account_controller.rb:227
1152 1152 msgid "Available!"
1153 1153 msgstr "Свободно!"
1154 1154  
1155   -#: app/controllers/public/account_controller.rb:229
  1155 +#: app/controllers/public/account_controller.rb:230
1156 1156 msgid "Unavailable!"
1157 1157 msgstr "Занято"
1158 1158  
... ... @@ -2161,11 +2161,11 @@ msgstr &quot;&quot;
2161 2161 msgid "tags|View all"
2162 2162 msgstr "Просмотреть все"
2163 2163  
2164   -#: app/models/add_friend.rb:21 app/models/invite_friend.rb:45
  2164 +#: app/models/add_friend.rb:23 app/models/invite_friend.rb:45
2165 2165 msgid "%s wants to be your friend."
2166 2166 msgstr "%s хочет быть вашим другом"
2167 2167  
2168   -#: app/models/add_friend.rb:30
  2168 +#: app/models/add_friend.rb:32
2169 2169 msgid ""
2170 2170 "You need to login to %{system} in order to accept %{requestor} as your "
2171 2171 "friend."
... ... @@ -3006,6 +3006,10 @@ msgstr &quot;Действительность&quot;
3006 3006 msgid "domain"
3007 3007 msgstr "домен"
3008 3008  
  3009 +#: app/models/domain.rb:-
  3010 +msgid "Google maps key"
  3011 +msgstr ""
  3012 +
3009 3013 #: app/models/domain.rb:13
3010 3014 msgid ""
3011 3015 "%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9) "
... ... @@ -3508,6 +3512,11 @@ msgstr &quot;Текущая папка:&quot;
3508 3512 msgid "Actions"
3509 3513 msgstr "Действия"
3510 3514  
  3515 +#: app/views/cms/view.rhtml:39 app/views/cms/view.rhtml:41
  3516 +#, fuzzy
  3517 +msgid "parent folder"
  3518 +msgstr "Текущая папка:"
  3519 +
3511 3520 #: app/views/cms/view.rhtml:60
3512 3521 msgid "Properties"
3513 3522 msgstr "Свойства"
... ...
test/factories.rb
  Diff comments   View file @243ecd0
... ... @@ -107,7 +107,7 @@ module Noosfero::Factory
107 107 :environment_id => environment_id,
108 108 }.merge(options)
109 109 user = fast_insert_with_timestamps(User, data)
110   - person = fast_insert_with_timestamps(Person, { :type => 'Person', :identifier => name, :user_id => user.id, :environment_id => environment_id }.merge(person_options))
  110 + person = fast_insert_with_timestamps(Person, { :type => 'Person', :identifier => name, :name => name, :user_id => user.id, :environment_id => environment_id }.merge(person_options))
111 111 homepage = fast_insert_with_timestamps(TextileArticle, { :type => 'TextileArticle', :name => 'homepage', :slug => 'homepage', :path => 'homepage', :profile_id => person.id })
112 112 fast_update(person, {:home_page_id => homepage.id})
113 113 box = fast_insert(Box, { :owner_type => "Profile", :owner_id => person.id, :position => 1})
... ...
test/unit/comment_test.rb
  Diff comments   View file @243ecd0
... ... @@ -179,4 +179,12 @@ class CommentTest &lt; Test::Unit::TestCase
179 179 assert comment.url[:view]
180 180 end
181 181  
  182 + should 'not fill fields with javascript' do
  183 + owner = create_user('testuser').person
  184 + article = owner.articles.create!(:name => 'test', :body => '...')
  185 + javascript = "<script>alert('XSS')</script>"
  186 + comment = article.comments.create!(:article => article, :name => javascript, :title => javascript, :body => javascript, :email => 'cracker@test.org')
  187 + assert_no_match(/<script>/, comment.name)
  188 + end
  189 +
182 190 end
... ...
test/unit/google_maps_test.rb
  Diff comments   View file @243ecd0
... ... @@ -44,4 +44,12 @@ class GoogleMapsTest &lt; Test::Unit::TestCase
44 44 assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
45 45 assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DIFFERENT_DOMAIN_KEY', GoogleMaps.api_url(other_domain.name)
46 46 end
  47 +
  48 + should 'not crash without a domain' do
  49 + Domain.delete_all
  50 + assert_nothing_raised do
  51 + GoogleMaps.key('example.com')
  52 + end
  53 + end
  54 +
47 55 end
... ...
test/unit/person_test.rb
  Diff comments   View file @243ecd0
... ... @@ -270,18 +270,6 @@ class PersonTest &lt; Test::Unit::TestCase
270 270 assert_equal 'José', p.name
271 271 end
272 272  
273   - should 'fallback to login when person_info is not present' do
274   - p = create_user('randomhacker').person
275   - p.name = nil
276   - assert_equal 'randomhacker', p.name
277   - end
278   -
279   - should 'fallback to login when name is blank' do
280   - p = create_user('randomhacker').person
281   - p.name = ''
282   - assert_equal 'randomhacker', p.name
283   - end
284   -
285 273 should 'have favorite enterprises' do
286 274 p = create_user('test_person').person
287 275 e = Enterprise.create!(:name => 'test_ent', :identifier => 'test_ent')
... ...
test/unit/thickbox_helper_test.rb
  Diff comments   View file @243ecd0
... ... @@ -3,14 +3,18 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
3 3 class ThickboxHelperTest < Test::Unit::TestCase
4 4 include ThickboxHelper
5 5  
  6 + def url_for(url)
  7 + url
  8 + end
  9 +
6 10 should 'create thickbox links correcly' do
7   - expects(:link_to).with('Title', '#TB_inline?height=300&width=500&inlineId=inlineLoginBox&modal=true', :class => 'thickbox')
8   - thickbox_inline_popup_link('Title', 'inlineLoginBox')
  11 + expects(:link_to).with('Title', '/url#TB_inline?height=300&width=500&inlineId=inlineLoginBox&modal=true', :class => 'thickbox')
  12 + thickbox_inline_popup_link('Title', '/url', 'inlineLoginBox')
9 13 end
10 14  
11 15 should 'pass along extra options' do
12 16 expects(:link_to).with('Title', anything, :class => 'thickbox', :id => 'lalala', :title => 'lelele')
13   - thickbox_inline_popup_link('Title', 'inlineLoginBox', :id => 'lalala', :title => 'lelele')
  17 + thickbox_inline_popup_link('Title', '/url', 'inlineLoginBox', :id => 'lalala', :title => 'lelele')
14 18 end
15 19  
16 20 should 'generate close button' do
... ...