From 2d5abd83f444c11a87628abb5a60beec1d1ddce5 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 20 Apr 2013 21:31:06 -0300 Subject: [PATCH] mergin with master --- AUTHORS | 2 ++ Gemfile | 23 +++++++++++++++-------- Gemfile.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++---------------------- INSTALL.varnish | 4 ++++ RELEASING | 1 + app/controllers/admin/environment_design_controller.rb | 2 +- app/controllers/admin/users_controller.rb | 14 ++++++++++++-- app/controllers/my_profile/profile_members_controller.rb | 1 - app/controllers/public/account_controller.rb | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- app/controllers/public/catalog_controller.rb | 2 +- app/helpers/application_helper.rb | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------- app/helpers/block_helper.rb | 2 +- app/helpers/blog_helper.rb | 17 +++-------------- app/helpers/catalog_helper.rb | 2 +- app/helpers/content_viewer_helper.rb | 4 ++-- app/helpers/dates_helper.rb | 30 ++++++++++++++++++++++++++---- app/helpers/forms_helper.rb | 47 ++++++++++------------------------------------- app/helpers/layout_helper.rb | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/helpers/profile_editor_helper.rb | 2 +- app/helpers/tags_helper.rb | 2 +- app/models/article.rb | 10 +++++++++- app/models/article_block.rb | 16 +++++++++++++++- app/models/blog.rb | 3 ++- app/models/environment.rb | 11 +++++------ app/models/event.rb | 14 +++++++++++++- app/models/feed_reader_block.rb | 8 ++++---- app/models/link_list_block.rb | 2 +- app/models/organization_mailing.rb | 2 +- app/models/profile.rb | 2 +- app/models/profile_list_block.rb | 5 ++--- app/models/spammer_logger.rb | 4 ++-- app/models/tags_block.rb | 29 ++++++++++++++++++++--------- app/models/uploaded_file.rb | 2 +- app/models/user.rb | 7 ++++--- app/views/account/_signup_form.rhtml | 26 ++++++++++++++++++++++++-- app/views/account/forgot_password.rhtml | 2 +- app/views/admin_panel/site_info.rhtml | 2 +- app/views/box_organizer/_article_block.rhtml | 39 +++++++++++++++++++++++++++++++++++---- app/views/box_organizer/_highlights_block.rhtml | 4 ++-- app/views/catalog/index.rhtml | 7 +++++-- app/views/cms/_text_editor_sidebar.rhtml | 7 ++++++- app/views/content_viewer/_comment_form.rhtml | 23 +++++++---------------- app/views/content_viewer/blog_page.rhtml | 16 ++++++++++++---- app/views/content_viewer/view_page.rhtml | 2 +- app/views/favorite_enterprises/index.rhtml | 2 +- app/views/layouts/_user.html.erb | 24 ++++++++++++++++++++++++ app/views/layouts/application-ng.rhtml | 50 ++++---------------------------------------------- app/views/profile/_profile_wall.rhtml | 2 +- app/views/profile_members/_manage_roles.html.erb | 4 ++-- app/views/search/_image.rhtml | 5 +++-- app/views/shared/tiny_mce.rhtml | 2 +- app/views/templates/index.html.erb | 6 +++--- app/views/themes/index.rhtml | 16 ++++++++-------- app/views/users/_user_csv.rhtml | 1 - app/views/users/index_csv.rhtml | 2 -- app/views/users/send_mail.rhtml | 2 +- config/cucumber.yml | 19 +++++++++++++++++-- config/database.yml.sqlite3 | 1 + config/environments/cucumber.rb | 11 +++++++++-- db/migrate/20130117132943_remove_index_articles_on_name.rb | 9 +++++++++ db/migrate/20130304200849_add_default_value_to_product_highlighted.rb | 10 ++++++++++ db/schema.rb | 4 ++-- debian/changelog | 24 ++++++++++++++++++++++++ features/accept_member.feature | 9 ++++++--- features/activate_enterprise.feature | 22 +++++++++++----------- features/admin_categories.feature | 28 ++++++++++++++-------------- features/approve_article.feature | 30 +++++++++++++++--------------- features/balloon.feature | 29 +++++++++++++---------------- features/blog.feature | 26 +++++++++++++------------- features/browse.feature | 81 +++++++++++++++++++++++++++++++++++++++++++-------------------------------------- features/browse_catalogs.feature | 30 +++++++++++++++--------------- features/browse_enterprises.feature | 4 ++-- features/categories_block.feature | 33 ++++++++++++++++----------------- features/change_organization_name.feature | 11 ++++++----- features/chat.feature | 44 ++++++++++++++++++++++---------------------- features/clickable_images.feature | 12 ++++++------ features/comment.feature | 47 +++++++++++++++++++++++++---------------------- features/comment_reply.feature | 10 +++++----- features/contact.feature | 9 ++++----- features/create_community.feature | 20 ++++++++++---------- features/delete_profile.feature | 20 ++++++++++++-------- features/edit_article.feature | 78 +++++++++++++++++++++++++++++++++++++++--------------------------------------- features/edit_block_of_links.feature | 2 +- features/edit_environment_templates.feature | 62 +++++++++++++++++++++++++++++--------------------------------- features/edit_language_block.feature | 12 ++++++------ features/edit_profile.feature | 44 ++++++++++++++++++++++---------------------- features/environment_name.feature | 1 + features/events.feature | 8 ++++---- features/export_users.feature | 6 ++---- features/featured_products_block.feature | 4 ++-- features/forum.feature | 24 ++++++++++++------------ features/gallery_navigation.feature | 20 ++++++++++++++------ features/http_caching.feature | 6 +++--- features/internationalization.feature | 1 + features/invitation.feature | 48 +++++++++++++++++++++++++++++++----------------- features/language_redirection.feature | 6 +++--- features/location.feature | 9 +++++---- features/login.feature | 73 +++++++++++++++++++++++++++++++++++++++++++------------------------------ features/manage_categories.feature | 7 +++---- features/manage_enterprises.feature | 6 ++++-- features/manage_inputs.feature | 46 +++++++++++++++++++++++----------------------- features/manage_product_price_details.feature | 26 ++++++++++++++------------ features/manage_products.feature | 115 +++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------- features/my_network_block.feature | 20 ++++++++++---------- features/new_content_on_cms.feature | 14 +++++++------- features/organization_custom_fields.feature | 6 +++--- features/plugins.feature | 16 ++++++++-------- features/plugins/README | 2 ++ features/private_profile.feature | 2 +- features/profile_domain.feature | 58 ++++++++++++++++++++++++++++++++-------------------------- features/profile_search.feature | 10 +++++----- features/publish_article.feature | 42 +++++++++++++++++++++--------------------- features/register_enterprise.feature | 20 +++++++++++--------- features/search.feature | 18 +++++++++--------- features/search_communities.feature | 14 +++++++------- features/search_contents.feature | 32 ++++++++++++++++---------------- features/search_enterprises.feature | 23 ++++++++++++----------- features/search_people.feature | 14 +++++++------- features/search_products.feature | 36 ++++++++++++++++++++---------------- features/send_email_to_environment_members.feature | 20 ++++++-------------- features/send_email_to_organization_members.feature | 10 +++++----- features/session_and_cookies_handling.feature | 3 +++ features/signup.feature | 13 ++++++++----- features/step_definitions/admin_categories_steps.rb | 4 ++++ features/step_definitions/chat_steps.rb | 3 +++ features/step_definitions/create_community_steps.rb | 8 ++++---- features/step_definitions/custom_web_steps.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++++ features/step_definitions/custom_webrat_steps.rb | 48 ------------------------------------------------ features/step_definitions/http_caching_steps.rb | 6 +++--- features/step_definitions/internationalization_steps.rb | 7 ++++--- features/step_definitions/invitation_steps.rb | 9 ++------- features/step_definitions/mezuro_steps.rb | 14 -------------- features/step_definitions/noosfero_steps.rb | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------- features/step_definitions/selenium_steps.rb | 133 ------------------------------------------------------------------------------------------------------------------------------------- features/step_definitions/web_steps.rb | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ features/step_definitions/webrat_steps.rb | 239 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- features/suggest_article.feature | 6 +++--- features/support/env.rb | 84 +++++++++++++++++++++++++++++++++++++++++++++--------------------------------------- features/support/fixtures.rb | 6 ------ features/support/paths.rb | 65 +++++++++++++++++++++++++++++++++++------------------------------ features/support/selenium.rb | 28 +++++++++++++++------------- features/support/version_check.rb | 29 ----------------------------- features/unblock_button.feature | 6 +++--- features/upload_files.feature | 4 ++-- gitignore.example | 1 + lib/noosfero.rb | 16 +++++++++------- lib/noosfero/core_ext/string.rb | 40 ++++++++++++++++++++++++++++++++++++++++ lib/tasks/cucumber.rake | 35 ++++++++++++++++++++--------------- lib/tasks/plugins_tests.rake | 48 +++++++++++++++++++++++++++++++++++------------- plugins/bsc/features/bsc.feature | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/bsc/features/contract.feature | 21 +++++++++++++++++++++ plugins/bsc/test/features/bsc.feature | 164 -------------------------------------------------------------------------------------------------------------------------------------------------------------------- plugins/bsc/test/features/contract.feature | 21 --------------------- plugins/custom_forms/lib/custom_forms_plugin/field.rb | 2 +- plugins/custom_forms/lib/custom_forms_plugin/form.rb | 2 +- plugins/custom_forms/test/unit/custom_forms_plugin/field_test.rb | 11 +++++++++++ plugins/custom_forms/test/unit/custom_forms_plugin/form_test.rb | 11 +++++++++++ plugins/mezuro/AUTHORS | 6 +++++- plugins/mezuro/README | 64 +++++++++++++++++++++++++++++++++++++++++++++++----------------- plugins/mezuro/SERVICE | 1 - plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb | 187 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb | 120 ------------------------------------------------------------------------------------------------------------------------ plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb | 29 +++++++++++++++++++++++++++++ plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/controllers/profile/mezuro_plugin_module_result_controller.rb | 21 +++++++++++++++++++++ plugins/mezuro/controllers/profile/mezuro_plugin_processing_controller.rb | 34 ++++++++++++++++++++++++++++++++++ plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb | 36 ++++++++++++++++++++++++++++++++++++ plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/features/configuration.feature | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/features/project.feature | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/features/reading.feature | 243 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/features/reading_group.feature | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/features/repository.feature | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/features/step_definitions/mezuro_steps.rb | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/features/support/hooks.rb | 12 ++++++++++++ plugins/mezuro/lib/kalibro/base_tool.rb | 17 +++++++++++------ plugins/mezuro/lib/kalibro/compound_metric.rb | 5 ----- plugins/mezuro/lib/kalibro/compound_metric_with_error.rb | 13 ------------- plugins/mezuro/lib/kalibro/configuration.rb | 33 ++++++++------------------------- plugins/mezuro/lib/kalibro/date_metric_result.rb | 16 ++++++++++++++++ plugins/mezuro/lib/kalibro/date_module_result.rb | 17 +++++++++++++++++ plugins/mezuro/lib/kalibro/error.rb | 21 --------------------- plugins/mezuro/lib/kalibro/errors/record_not_found.rb | 2 ++ plugins/mezuro/lib/kalibro/errors/standard.rb | 4 ++++ plugins/mezuro/lib/kalibro/metric.rb | 14 +++++++++++++- plugins/mezuro/lib/kalibro/metric_configuration.rb | 67 +++++++++++++++++-------------------------------------------------- plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb | 38 ++++++++++++++++++++++++++++++++++++++ plugins/mezuro/lib/kalibro/metric_result.rb | 56 +++++++++++++++++++++++++++++++++----------------------- plugins/mezuro/lib/kalibro/model.rb | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------- plugins/mezuro/lib/kalibro/module.rb | 13 ------------- plugins/mezuro/lib/kalibro/module_node.rb | 21 --------------------- plugins/mezuro/lib/kalibro/module_result.rb | 73 +++++++++++++++++++++++++++++-------------------------------------------- plugins/mezuro/lib/kalibro/native_metric.rb | 17 ----------------- plugins/mezuro/lib/kalibro/process_time.rb | 9 +++++++++ plugins/mezuro/lib/kalibro/processing.rb | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/lib/kalibro/project.rb | 50 ++++++++------------------------------------------ plugins/mezuro/lib/kalibro/project_result.rb | 100 ---------------------------------------------------------------------------------------------------- plugins/mezuro/lib/kalibro/range.rb | 57 +++++++++++++++++++++++++++++++++++++++++++++------------ plugins/mezuro/lib/kalibro/range_snapshot.rb | 17 +++++++++++++++++ plugins/mezuro/lib/kalibro/reading.rb | 34 ++++++++++++++++++++++++++++++++++ plugins/mezuro/lib/kalibro/reading_group.rb | 30 ++++++++++++++++++++++++++++++ plugins/mezuro/lib/kalibro/repository.rb | 37 +++++++++++++++++++++++++++++++++++-- plugins/mezuro/lib/kalibro/throwable.rb | 21 +++++++++++++++++++++ plugins/mezuro/lib/mezuro_plugin.rb | 16 +++++++++++++++- plugins/mezuro/lib/mezuro_plugin/configuration_content.rb | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------- plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb | 44 ++++++++++++++++++++++++-------------------- plugins/mezuro/lib/mezuro_plugin/helpers/module_result_helper.rb | 7 +++++++ plugins/mezuro/lib/mezuro_plugin/project_content.rb | 96 ++++++++++++++++++++++++++++++++++++++---------------------------------------------------------- plugins/mezuro/lib/mezuro_plugin/reading_group_content.rb | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/licenses.yaml.example | 69 --------------------------------------------------------------------- plugins/mezuro/licenses.yml.example | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/public/icons/mezuro.png | Bin 0 -> 3907 bytes plugins/mezuro/public/javascripts/colorPicker/LICENSE | 22 ---------------------- plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.js | 328 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.min.js | 26 -------------------------- plugins/mezuro/public/javascripts/processing.js | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/public/javascripts/project_content.js | 135 --------------------------------------------------------------------------------------------------------------------------------------- plugins/mezuro/public/javascripts/validations.js | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- plugins/mezuro/public/style.css | 5 +++++ plugins/mezuro/script/install/install-rvm.sh | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/script/tests/delete_all_kalibro_entries.sh | 5 +++++ plugins/mezuro/script/tests/kalibro_scripts.conf | 6 ++++++ plugins/mezuro/script/tests/prepare_kalibro_query_file.sh | 20 ++++++++++++++++++++ plugins/mezuro/script/tests/run_acceptance_tests.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/service.yaml.example | 2 -- plugins/mezuro/service.yml.example | 1 + plugins/mezuro/test/features/adding_metric_configuration.feature | 67 ------------------------------------------------------------------- plugins/mezuro/test/features/adding_ranges.feature | 42 ------------------------------------------ plugins/mezuro/test/features/creating_configuration.feature | 40 ---------------------------------------- plugins/mezuro/test/features/creating_project.feature | 55 ------------------------------------------------------- plugins/mezuro/test/features/echo_port_test.rb | 90 ------------------------------------------------------------------------------------------ plugins/mezuro/test/features/editing_configuration.feature | 49 ------------------------------------------------- plugins/mezuro/test/features/removing_metric_configuration.feature | 32 -------------------------------- plugins/mezuro/test/fixtures/base_tool_fixtures.rb | 14 +++++++++----- plugins/mezuro/test/fixtures/compound_metric_fixtures.rb | 11 ----------- plugins/mezuro/test/fixtures/compound_metric_with_error_fixtures.rb | 20 -------------------- plugins/mezuro/test/fixtures/configuration_content_fixtures.rb | 23 +++++++++++++++++++++++ plugins/mezuro/test/fixtures/configuration_fixtures.rb | 22 +++++++++++----------- plugins/mezuro/test/fixtures/date_metric_result_fixtures.rb | 33 +++++++++++++++++++++++++++++++++ plugins/mezuro/test/fixtures/date_module_result_fixtures.rb | 24 ++++++++++++++++++++++++ plugins/mezuro/test/fixtures/error_fixtures.rb | 20 -------------------- plugins/mezuro/test/fixtures/metric_configuration_fixtures.rb | 55 +++++++++++++++++++++++++++++++++---------------------- plugins/mezuro/test/fixtures/metric_configuration_snapshot_fixtures.rb | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/fixtures/metric_fixtures.rb | 27 +++++++++++++++++++++++++++ plugins/mezuro/test/fixtures/metric_result_fixtures.rb | 51 ++++++++++++++++++++++++++++++--------------------- plugins/mezuro/test/fixtures/module_node_fixtures.rb | 47 ----------------------------------------------- plugins/mezuro/test/fixtures/module_result_fixtures.rb | 40 ++++++++++++++++++++++++++++------------ plugins/mezuro/test/fixtures/native_metric_fixtures.rb | 19 ------------------- plugins/mezuro/test/fixtures/process_time_fixtures.rb | 11 +++++++++++ plugins/mezuro/test/fixtures/processing_fixtures.rb | 30 ++++++++++++++++++++++++++++++ plugins/mezuro/test/fixtures/project_content_fixtures.rb | 9 +++++++++ plugins/mezuro/test/fixtures/project_fixtures.rb | 32 ++++++-------------------------- plugins/mezuro/test/fixtures/project_result_fixtures.rb | 35 ----------------------------------- plugins/mezuro/test/fixtures/range_fixtures.rb | 20 +++++++++----------- plugins/mezuro/test/fixtures/range_snapshot_fixtures.rb | 19 +++++++++++++++++++ plugins/mezuro/test/fixtures/reading_fixtures.rb | 16 ++++++++++++++++ plugins/mezuro/test/fixtures/reading_group_content_fixtures.rb | 9 +++++++++ plugins/mezuro/test/fixtures/reading_group_fixtures.rb | 15 +++++++++++++++ plugins/mezuro/test/fixtures/repository_fixtures.rb | 19 ++++++++++++++++++- plugins/mezuro/test/fixtures/stack_trace_element_fixtures.rb | 10 +++++----- plugins/mezuro/test/fixtures/throwable_fixtures.rb | 19 +++++++++++++++++++ plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb | 228 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb | 141 --------------------------------------------------------------------------------------------------------------------------------------------- plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/functional/profile/mezuro_plugin_processing_controller_test.rb | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/base_tool_test.rb | 17 ++++------------- plugins/mezuro/test/unit/kalibro/compound_metric_test.rb | 20 -------------------- plugins/mezuro/test/unit/kalibro/compound_metric_with_error_test.rb | 20 -------------------- plugins/mezuro/test/unit/kalibro/configuration_test.rb | 54 +++++++++++++++++++++++++++++------------------------- plugins/mezuro/test/unit/kalibro/date_metric_result_test.rb | 20 ++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/date_module_result_test.rb | 20 ++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/error_test.rb | 20 -------------------- plugins/mezuro/test/unit/kalibro/metric_configuration_snapshot_test.rb | 24 ++++++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/metric_configuration_test.rb | 68 +++++++++++++++++++++++++------------------------------------------- plugins/mezuro/test/unit/kalibro/metric_result_test.rb | 41 +++++++++++++++++++++++++++++++---------- plugins/mezuro/test/unit/kalibro/metric_test.rb | 29 +++++++++++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/module_node_test.rb | 19 ------------------- plugins/mezuro/test/unit/kalibro/module_result_test.rb | 40 ++++++++++++++++++++++++++-------------- plugins/mezuro/test/unit/kalibro/module_test.rb | 12 +----------- plugins/mezuro/test/unit/kalibro/native_metric_test.rb | 20 -------------------- plugins/mezuro/test/unit/kalibro/process_time_test.rb | 25 +++++++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/processing_test.rb | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/project_result_test.rb | 88 ---------------------------------------------------------------------------------------- plugins/mezuro/test/unit/kalibro/project_test.rb | 95 ++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- plugins/mezuro/test/unit/kalibro/range_snapshot_test.rb | 32 ++++++++++++++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/range_test.rb | 45 ++++++++++++++++++++++++++++++--------------- plugins/mezuro/test/unit/kalibro/reading_group_test.rb | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/reading_test.rb | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/unit/kalibro/repository_test.rb | 43 +++++++++++++++++++++++++++++++++++++++++-- plugins/mezuro/test/unit/kalibro/throwable_test.rb | 20 ++++++++++++++++++++ plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb | 64 +++++++++++++++++++++++++++++++++++++++------------------------- plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------- plugins/mezuro/test/unit/mezuro_plugin/helpers/module_result_helper_test.rb | 15 +++++++++++++++ plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb | 114 ++++++++++++++++++++++++++---------------------------------------------------------------------------------------- plugins/mezuro/test/unit/mezuro_plugin/reading_group_content_test.rb | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/test/unit/mezuro_plugin_test.rb | 8 -------- plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb | 25 ++++++++----------------- plugins/mezuro/views/cms/mezuro_plugin/_mezuro_content_form.html.erb | 4 ++++ plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb | 44 ++------------------------------------------ plugins/mezuro/views/cms/mezuro_plugin/_reading_group_content.html.erb | 11 +++++++++++ plugins/mezuro/views/content_viewer/_module_result.rhtml | 52 ---------------------------------------------------- plugins/mezuro/views/content_viewer/_project_error.rhtml | 12 ------------ plugins/mezuro/views/content_viewer/_project_result.rhtml | 39 --------------------------------------- plugins/mezuro/views/content_viewer/_score_history.rhtml | 2 -- plugins/mezuro/views/content_viewer/_source_tree.rhtml | 45 --------------------------------------------- plugins/mezuro/views/content_viewer/show_configuration.rhtml | 56 +++++++++++++++++++++++++++++++++++++------------------- plugins/mezuro/views/content_viewer/show_project.rhtml | 69 +++++++++++++++++++++++++++++++-------------------------------------- plugins/mezuro/views/content_viewer/show_reading_group.rhtml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb | 19 +++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb | 2 ++ plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb | 12 ++++++++++++ plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml | 26 ++++++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml | 15 +++++++++++++++ plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb | 18 ++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb | 16 ++++++++++++++++ plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb | 18 ++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb | 7 +++++++ plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb | 7 +++++++ plugins/mezuro/views/mezuro_plugin_module_result/_error_page.html.erb | 2 ++ plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml | 41 +++++++++++++++++++++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml | 24 ++++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_module_result/_score_history.rhtml | 1 + plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml | 34 ++++++++++++++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb | 4 ---- plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb | 2 ++ plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb | 12 ------------ plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb | 3 --- plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb | 17 ----------------- plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb | 61 ------------------------------------------------------------- plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb | 16 ---------------- plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb | 18 ------------------ plugins/mezuro/views/mezuro_plugin_myprofile/create_range.rjs | 2 -- plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb | 81 --------------------------------------------------------------------------------- plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb | 89 ----------------------------------------------------------------------------------------- plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs | 2 -- plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb | 44 -------------------------------------------- plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb | 51 --------------------------------------------------- plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs | 2 -- plugins/mezuro/views/mezuro_plugin_myprofile/update_range.rjs | 1 - plugins/mezuro/views/mezuro_plugin_processing/_error_page.html.erb | 2 ++ plugins/mezuro/views/mezuro_plugin_processing/_processing.rhtml | 36 ++++++++++++++++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_processing/_processing_error.rhtml | 12 ++++++++++++ plugins/mezuro/views/mezuro_plugin_profile/_error_page.html.erb | 2 ++ plugins/mezuro/views/mezuro_plugin_profile/error_page.html.erb | 2 -- plugins/mezuro/views/mezuro_plugin_range/_edit.html.erb | 4 ++++ plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb | 2 ++ plugins/mezuro/views/mezuro_plugin_range/_form.html.erb | 37 +++++++++++++++++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_range/_new.html.erb | 3 +++ plugins/mezuro/views/mezuro_plugin_range/_range.html.erb | 24 ++++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb | 31 +++++++++++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_range/create.rjs | 6 ++++++ plugins/mezuro/views/mezuro_plugin_range/edit.rjs | 3 +++ plugins/mezuro/views/mezuro_plugin_range/new.rjs | 3 +++ plugins/mezuro/views/mezuro_plugin_range/update.rjs | 5 +++++ plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb | 13 +++++++++++++ plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb | 10 ++++++++++ plugins/mezuro/views/mezuro_plugin_reading/new.html.erb | 9 +++++++++ plugins/mezuro/views/mezuro_plugin_repository/_error_page.html.erb | 2 ++ plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb | 23 +++++++++++++++++++++++ plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb | 7 +++++++ plugins/mezuro/views/mezuro_plugin_repository/new.html.erb | 6 ++++++ plugins/mezuro/views/mezuro_plugin_repository/show.html.erb | 45 +++++++++++++++++++++++++++++++++++++++++++++ plugins/require_auth_to_comment/public/hide_comment_form.js | 2 +- plugins/send_email/features/send_email_plugin.feature | 41 +++++++++++++++++++++++++++++++++++++++++ plugins/send_email/test/features/send_email_plugin.feature | 41 ----------------------------------------- plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb | 49 ++++++++++++++++++++++++++++++++++++------------- plugins/shopping_cart/lib/shopping_cart_plugin.rb | 4 ---- plugins/shopping_cart/public/cart.js | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------- plugins/shopping_cart/public/style.css | 2 +- plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb | 6 ++++++ plugins/shopping_cart/views/cart.html.erb | 21 +++++++++++++++++---- plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb | 2 +- plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb | 2 +- plugins/spaminator/lib/spaminator_plugin/spaminator.rb | 10 ++++++---- po/de/noosfero.po | 478 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- po/eo/noosfero.po | 457 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- po/es/noosfero.po | 481 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- po/fr/noosfero.po | 479 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- po/hy/noosfero.po | 477 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- po/it/noosfero.po | 457 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- po/noosfero.pot | 457 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- po/pt/noosfero.po | 486 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- po/ru/noosfero.po | 477 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- public/javascripts/application.js | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- public/javascripts/comment_form.js | 23 +++++++++++++++++++++++ public/stylesheets/application.css | 53 ++++++++++++++++++++++++++++++++++++++++++----------- public/stylesheets/search.css | 40 +++++++++++++++++++++++++++++++++++++++- script/cucumber | 13 +++---------- script/noosfero-plugins | 4 ++++ script/sample-profiles | 61 ++++++++++++++++++++++++++++++++++++++++++------------------- test/functional/account_controller_test.rb | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- test/functional/application_controller_test.rb | 6 ++++++ test/functional/catalog_controller_test.rb | 17 +++++++++++++++++ test/functional/cms_controller_test.rb | 24 ++++++++++++++++++++++++ test/functional/content_viewer_controller_test.rb | 8 ++++---- test/functional/enterprise_registration_controller_test.rb | 17 +++++++++++++++++ test/functional/environment_design_controller_test.rb | 17 ++++++++++++----- test/functional/memberships_controller_test.rb | 16 ++++++++++++++++ test/functional/users_controller_test.rb | 1 + test/integration/blocks_test.rb | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/integration/signup_test.rb | 35 ++++++++++++++++++++++++++++++++++- test/integration/user_registers_at_the_application_test.rb | 3 +++ test/unit/application_helper_test.rb | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/unit/article_test.rb | 11 +++++++++++ test/unit/block_helper_test.rb | 13 +++++++++++++ test/unit/content_viewer_helper_test.rb | 3 +-- test/unit/dates_helper_test.rb | 22 +++++++++++++++++++++- test/unit/organization_mailing_test.rb | 6 ++++++ test/unit/profile_test.rb | 6 +++--- test/unit/tags_block_test.rb | 17 +++++++++++++++-- test/unit/user_test.rb | 2 ++ vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake | 4 ++-- vendor/plugins/honeypot/init.rb | 18 ++++++++++++++++++ vendor/plugins/honeypot/lib/form_tag_helper.rb | 36 ++++++++++++++++++++++++++++++++++++ 420 files changed, 10963 insertions(+), 7586 deletions(-) create mode 100644 app/helpers/layout_helper.rb create mode 100644 app/views/layouts/_user.html.erb delete mode 100644 app/views/users/_user_csv.rhtml delete mode 100644 app/views/users/index_csv.rhtml create mode 100644 db/migrate/20130117132943_remove_index_articles_on_name.rb create mode 100644 db/migrate/20130304200849_add_default_value_to_product_highlighted.rb create mode 100644 features/plugins/README create mode 100644 features/step_definitions/admin_categories_steps.rb create mode 100644 features/step_definitions/chat_steps.rb create mode 100644 features/step_definitions/custom_web_steps.rb delete mode 100644 features/step_definitions/custom_webrat_steps.rb delete mode 100644 features/step_definitions/mezuro_steps.rb delete mode 100644 features/step_definitions/selenium_steps.rb create mode 100644 features/step_definitions/web_steps.rb delete mode 100644 features/step_definitions/webrat_steps.rb delete mode 100644 features/support/fixtures.rb delete mode 100644 features/support/version_check.rb create mode 100644 plugins/bsc/features/bsc.feature create mode 100644 plugins/bsc/features/contract.feature delete mode 100644 plugins/bsc/test/features/bsc.feature delete mode 100644 plugins/bsc/test/features/contract.feature delete mode 100644 plugins/mezuro/SERVICE delete mode 100644 plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb delete mode 100644 plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb create mode 100644 plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb create mode 100644 plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb create mode 100644 plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb create mode 100644 plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb create mode 100644 plugins/mezuro/controllers/profile/mezuro_plugin_module_result_controller.rb create mode 100644 plugins/mezuro/controllers/profile/mezuro_plugin_processing_controller.rb create mode 100644 plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb create mode 100644 plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb create mode 100644 plugins/mezuro/features/configuration.feature create mode 100644 plugins/mezuro/features/project.feature create mode 100644 plugins/mezuro/features/reading.feature create mode 100644 plugins/mezuro/features/reading_group.feature create mode 100644 plugins/mezuro/features/repository.feature create mode 100644 plugins/mezuro/features/step_definitions/mezuro_steps.rb create mode 100644 plugins/mezuro/features/support/hooks.rb delete mode 100644 plugins/mezuro/lib/kalibro/compound_metric.rb delete mode 100644 plugins/mezuro/lib/kalibro/compound_metric_with_error.rb create mode 100644 plugins/mezuro/lib/kalibro/date_metric_result.rb create mode 100644 plugins/mezuro/lib/kalibro/date_module_result.rb delete mode 100644 plugins/mezuro/lib/kalibro/error.rb create mode 100644 plugins/mezuro/lib/kalibro/errors/record_not_found.rb create mode 100644 plugins/mezuro/lib/kalibro/errors/standard.rb create mode 100644 plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb delete mode 100644 plugins/mezuro/lib/kalibro/module_node.rb delete mode 100644 plugins/mezuro/lib/kalibro/native_metric.rb create mode 100644 plugins/mezuro/lib/kalibro/process_time.rb create mode 100644 plugins/mezuro/lib/kalibro/processing.rb delete mode 100644 plugins/mezuro/lib/kalibro/project_result.rb create mode 100644 plugins/mezuro/lib/kalibro/range_snapshot.rb create mode 100644 plugins/mezuro/lib/kalibro/reading.rb create mode 100644 plugins/mezuro/lib/kalibro/reading_group.rb create mode 100644 plugins/mezuro/lib/kalibro/throwable.rb create mode 100644 plugins/mezuro/lib/mezuro_plugin/helpers/module_result_helper.rb create mode 100644 plugins/mezuro/lib/mezuro_plugin/reading_group_content.rb delete mode 100644 plugins/mezuro/licenses.yaml.example create mode 100644 plugins/mezuro/licenses.yml.example create mode 100644 plugins/mezuro/public/icons/mezuro.png delete mode 100644 plugins/mezuro/public/javascripts/colorPicker/LICENSE delete mode 100644 plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.js delete mode 100644 plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.min.js create mode 100644 plugins/mezuro/public/javascripts/processing.js delete mode 100644 plugins/mezuro/public/javascripts/project_content.js create mode 100644 plugins/mezuro/script/install/install-rvm.sh create mode 100755 plugins/mezuro/script/tests/delete_all_kalibro_entries.sh create mode 100644 plugins/mezuro/script/tests/kalibro_scripts.conf create mode 100755 plugins/mezuro/script/tests/prepare_kalibro_query_file.sh create mode 100755 plugins/mezuro/script/tests/run_acceptance_tests.sh delete mode 100644 plugins/mezuro/service.yaml.example create mode 100644 plugins/mezuro/service.yml.example delete mode 100644 plugins/mezuro/test/features/adding_metric_configuration.feature delete mode 100644 plugins/mezuro/test/features/adding_ranges.feature delete mode 100644 plugins/mezuro/test/features/creating_configuration.feature delete mode 100644 plugins/mezuro/test/features/creating_project.feature delete mode 100644 plugins/mezuro/test/features/echo_port_test.rb delete mode 100644 plugins/mezuro/test/features/editing_configuration.feature delete mode 100644 plugins/mezuro/test/features/removing_metric_configuration.feature delete mode 100644 plugins/mezuro/test/fixtures/compound_metric_fixtures.rb delete mode 100644 plugins/mezuro/test/fixtures/compound_metric_with_error_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/configuration_content_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/date_metric_result_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/date_module_result_fixtures.rb delete mode 100644 plugins/mezuro/test/fixtures/error_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/metric_configuration_snapshot_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/metric_fixtures.rb delete mode 100644 plugins/mezuro/test/fixtures/module_node_fixtures.rb delete mode 100644 plugins/mezuro/test/fixtures/native_metric_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/process_time_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/processing_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/project_content_fixtures.rb delete mode 100644 plugins/mezuro/test/fixtures/project_result_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/range_snapshot_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/reading_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/reading_group_content_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/reading_group_fixtures.rb create mode 100644 plugins/mezuro/test/fixtures/throwable_fixtures.rb delete mode 100644 plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb delete mode 100644 plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb create mode 100644 plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb create mode 100644 plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb create mode 100644 plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb create mode 100644 plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb create mode 100644 plugins/mezuro/test/functional/profile/mezuro_plugin_processing_controller_test.rb create mode 100644 plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb delete mode 100644 plugins/mezuro/test/unit/kalibro/compound_metric_test.rb delete mode 100644 plugins/mezuro/test/unit/kalibro/compound_metric_with_error_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/date_metric_result_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/date_module_result_test.rb delete mode 100644 plugins/mezuro/test/unit/kalibro/error_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/metric_configuration_snapshot_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/metric_test.rb delete mode 100644 plugins/mezuro/test/unit/kalibro/module_node_test.rb delete mode 100644 plugins/mezuro/test/unit/kalibro/native_metric_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/process_time_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/processing_test.rb delete mode 100644 plugins/mezuro/test/unit/kalibro/project_result_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/range_snapshot_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/reading_group_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/reading_test.rb create mode 100644 plugins/mezuro/test/unit/kalibro/throwable_test.rb create mode 100644 plugins/mezuro/test/unit/mezuro_plugin/helpers/module_result_helper_test.rb create mode 100644 plugins/mezuro/test/unit/mezuro_plugin/reading_group_content_test.rb create mode 100644 plugins/mezuro/views/cms/mezuro_plugin/_mezuro_content_form.html.erb create mode 100644 plugins/mezuro/views/cms/mezuro_plugin/_reading_group_content.html.erb delete mode 100644 plugins/mezuro/views/content_viewer/_module_result.rhtml delete mode 100644 plugins/mezuro/views/content_viewer/_project_error.rhtml delete mode 100644 plugins/mezuro/views/content_viewer/_project_result.rhtml delete mode 100644 plugins/mezuro/views/content_viewer/_score_history.rhtml delete mode 100644 plugins/mezuro/views/content_viewer/_source_tree.rhtml create mode 100644 plugins/mezuro/views/content_viewer/show_reading_group.rhtml create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_error_page.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_score_history.rhtml create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/create_range.rjs delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/update_range.rjs create mode 100644 plugins/mezuro/views/mezuro_plugin_processing/_error_page.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_processing/_processing.rhtml create mode 100644 plugins/mezuro/views/mezuro_plugin_processing/_processing_error.rhtml create mode 100644 plugins/mezuro/views/mezuro_plugin_profile/_error_page.html.erb delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/error_page.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_edit.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_form.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_new.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_range.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_range/create.rjs create mode 100644 plugins/mezuro/views/mezuro_plugin_range/edit.rjs create mode 100644 plugins/mezuro/views/mezuro_plugin_range/new.rjs create mode 100644 plugins/mezuro/views/mezuro_plugin_range/update.rjs create mode 100644 plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_reading/new.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/_error_page.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/new.html.erb create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/show.html.erb create mode 100644 plugins/send_email/features/send_email_plugin.feature delete mode 100644 plugins/send_email/test/features/send_email_plugin.feature create mode 100644 public/javascripts/comment_form.js create mode 100644 test/integration/blocks_test.rb create mode 100644 test/unit/block_helper_test.rb create mode 100644 vendor/plugins/honeypot/init.rb create mode 100644 vendor/plugins/honeypot/lib/form_tag_helper.rb diff --git a/AUTHORS b/AUTHORS index bcf70d9..b39b975 100644 --- a/AUTHORS +++ b/AUTHORS @@ -120,6 +120,7 @@ Larissa Reis Leandro Nunes dos Santos Leandro Nunes dos Santos LinguÁgil 2010 +Luis David Aguilar Carlos Martín Olivera Moises Machado Nanda Lopes @@ -147,6 +148,7 @@ Rodrigo Souto Ronny Kursawe Samuel R. C. Vale Valessio Brito +Visita Yann Lugrin Ideas, specifications and incentive diff --git a/Gemfile b/Gemfile index bf53e96..2092c52 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,21 @@ -source :rubygems -gem 'cucumber', '0.4.0' -gem 'webrat', '0.5.1' -gem 'rspec', '1.2.9' -gem 'rspec-rails', '1.2.9' -gem 'Selenium', '>= 1.1.14' -gem 'selenium-client', '>= 1.2.17' -gem 'database_cleaner' +source "https://rubygems.org" + gem 'exception_notification', '1.0.20090728' gem 'system_timer' +group :test do + gem 'rspec', '1.2.9' + gem 'rspec-rails', '1.2.9' +end + +group :cucumber do + gem 'rake', '0.8.7' + gem 'cucumber-rails', '0.3.2' + gem 'capybara', '1.1.1' + gem 'cucumber', '1.1.0' + gem 'database_cleaner' +end + def program(name) unless system("which #{name} > /dev/null") puts "W: Program #{name} is needed, but was not found in your PATH" diff --git a/Gemfile.lock b/Gemfile.lock index 0a42c0b..281190d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,44 +1,66 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: - Selenium (1.1.14) - builder (3.0.0) - cucumber (0.4.0) + builder (3.1.4) + capybara (1.1.1) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + selenium-webdriver (~> 2.0) + xpath (~> 0.1.4) + childprocess (0.3.6) + ffi (~> 1.0, >= 1.0.6) + cucumber (1.1.0) builder (>= 2.1.2) diff-lcs (>= 1.1.2) - polyglot (>= 0.2.9) - term-ansicolor (>= 1.0.3) - treetop (>= 1.4.2) - database_cleaner (0.7.0) + gherkin (~> 2.5.0) + json (>= 1.4.6) + term-ansicolor (>= 1.0.6) + cucumber-rails (0.3.2) + cucumber (>= 0.8.0) + database_cleaner (0.9.1) diff-lcs (1.1.3) exception_notification (1.0.20090728) - nokogiri (1.5.0) - polyglot (0.3.3) - rack (1.3.5) + ffi (1.2.0) + gherkin (2.5.4) + json (>= 1.4.6) + json (1.7.5) + libwebsocket (0.1.6.1) + websocket + mime-types (1.19) + multi_json (1.3.7) + nokogiri (1.5.5) + rack (1.1.0) + rack-test (0.6.2) + rack (>= 1.0) + rake (0.8.7) rspec (1.2.9) rspec-rails (1.2.9) rack (>= 1.0.0) rspec (>= 1.2.9) - selenium-client (1.2.18) + rubyzip (0.9.9) + selenium-webdriver (2.26.0) + childprocess (>= 0.2.5) + libwebsocket (~> 0.1.3) + multi_json (~> 1.0) + rubyzip system_timer (1.2.4) term-ansicolor (1.0.7) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - webrat (0.5.1) - nokogiri (>= 1.2.0) - rack (>= 1.0) + websocket (1.0.4) + xpath (0.1.4) + nokogiri (~> 1.3) PLATFORMS ruby DEPENDENCIES - Selenium (>= 1.1.14) - cucumber (= 0.4.0) + capybara (= 1.1.1) + cucumber (= 1.1.0) + cucumber-rails (= 0.3.2) database_cleaner exception_notification (= 1.0.20090728) + rake (= 0.8.7) rspec (= 1.2.9) rspec-rails (= 1.2.9) - selenium-client (>= 1.2.17) system_timer - webrat (= 0.5.1) diff --git a/INSTALL.varnish b/INSTALL.varnish index 2268036..ffcdeab 100644 --- a/INSTALL.varnish +++ b/INSTALL.varnish @@ -45,6 +45,10 @@ Install the RPAF apache module (or skip this step if not using apache): On manual installations, change "/etc/noosfero/*" to "{Rails.root}/etc/noosfero/*" +NOTE: it is very important that the *.vcl files are included in that order, +i.e. *first* include "varnish-noosfero.vcl", and *after* +"noosfero-accept-language.cvl". + 4c) Restart Varnish # invoke-rc.d varnish restart diff --git a/RELEASING b/RELEASING index 2d45c61..89b1038 100644 --- a/RELEASING +++ b/RELEASING @@ -31,6 +31,7 @@ To prepare a release of noosfero, you must follow the steps below: sha1 of the package (with sha1sum and paste the SHA1 hash as comment in the attachment form) * Download the attached and verify the MD5 hash +* Push the new version tag (with git push --tags) * Update an eventual demonstration version that you run. * Write an announcement e-mail to the relevant mailing lists pointing to the release notes, and maybe to the demonstration version. diff --git a/app/controllers/admin/environment_design_controller.rb b/app/controllers/admin/environment_design_controller.rb index 81bfb03..eaf60f1 100644 --- a/app/controllers/admin/environment_design_controller.rb +++ b/app/controllers/admin/environment_design_controller.rb @@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController protect 'edit_environment_design', :environment def available_blocks - @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ] + @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ] @available_blocks = @available_blocks + plugins.dispatch(:extra_blocks, :type => Environment) end diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 489ca10..e71c17b 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -1,3 +1,5 @@ +require 'csv' + class UsersController < AdminController protect 'manage_environment_users', :environment @@ -15,8 +17,16 @@ class UsersController < AdminController :disposition => "attachment; filename=users.xml" end format.csv do - @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person]) - render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false + # using a direct connection with the dbms to optimize + command = User.send(:sanitize_sql, ["SELECT profiles.name, users.email FROM profiles + INNER JOIN users ON profiles.user_id=users.id + WHERE profiles.environment_id = ?", environment.id]) + users = User.connection.execute(command) + csv_content = "name;email\n" + users.each { |u| + CSV.generate_row([u['name'], u['email']], 2, csv_content, fs=';') + } + render :text => csv_content, :content_type => 'text/csv', :layout => false end end end diff --git a/app/controllers/my_profile/profile_members_controller.rb b/app/controllers/my_profile/profile_members_controller.rb index 413ac62..654ce5b 100644 --- a/app/controllers/my_profile/profile_members_controller.rb +++ b/app/controllers/my_profile/profile_members_controller.rb @@ -32,7 +32,6 @@ class ProfileMembersController < MyProfileController def last_admin @roles = [Profile::Roles.admin(environment.id)] - @pre_population = [].to_json end def add_role diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb index a854471..4ac1540 100644 --- a/app/controllers/public/account_controller.rb +++ b/app/controllers/public/account_controller.rb @@ -4,6 +4,7 @@ class AccountController < ApplicationController before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise] before_filter :redirect_if_logged_in, :only => [:login, :signup] + before_filter :protect_from_bots, :only => :signup # say something nice, you goof! something sweet. def index @@ -55,6 +56,11 @@ class AccountController < ApplicationController render :action => 'login', :layout => false end + def signup_time + key = set_signup_start_time_for_now + render :text => { :ok=>true, :key=>key }.to_json + end + # action to register an user to the application def signup if @plugins.dispatch(:allow_user_registration).include?(false) @@ -62,12 +68,9 @@ class AccountController < ApplicationController session[:notice] = _("This environment doesn't allow user registration.") end + @block_bot = !!session[:may_be_a_bot] @invitation_code = params[:invitation_code] begin - if params[:user] - params[:user].delete(:password_confirmation_clear) - params[:user].delete(:password_clear) - end @user = User.new(params[:user]) @user.terms_of_use = environment.terms_of_use @user.environment = environment @@ -76,19 +79,28 @@ class AccountController < ApplicationController @person = Person.new(params[:profile_data]) @person.environment = @user.environment if request.post? - @user.signup! - owner_role = Role.find_by_name('owner') - @user.person.affiliate(@user.person, [owner_role]) if owner_role - invitation = Task.find_by_code(@invitation_code) - if invitation - invitation.update_attributes!({:friend => @user.person}) - invitation.finish - end - if @user.activated? - self.current_user = @user - redirect_to '/' + if may_be_a_bot + set_signup_start_time_for_now + @block_bot = true + session[:may_be_a_bot] = true else - @register_pending = true + if session[:may_be_a_bot] + return false unless verify_recaptcha :model=>@user, :message=>_('Captcha (the human test)') + end + @user.signup! + owner_role = Role.find_by_name('owner') + @user.person.affiliate(@user.person, [owner_role]) if owner_role + invitation = Task.find_by_code(@invitation_code) + if invitation + invitation.update_attributes!({:friend => @user.person}) + invitation.finish + end + if @user.activated? + self.current_user = @user + redirect_to '/' + else + @register_pending = true + end end end rescue ActiveRecord::RecordInvalid @@ -97,6 +109,7 @@ class AccountController < ApplicationController @person.errors.delete(:user_id) render :action => 'signup' end + clear_signup_start_time end # action to perform logout from the application @@ -271,7 +284,36 @@ class AccountController < ApplicationController def no_redirect @cannot_redirect = true end - + + def set_signup_start_time_for_now + key = 'signup_start_time_' + rand.to_s.split('.')[1] + Rails.cache.write key, Time.now + key + end + + def get_signup_start_time + Rails.cache.read params[:signup_time_key] + end + + def clear_signup_start_time + Rails.cache.delete params[:signup_time_key] if params[:signup_time_key] + end + + def may_be_a_bot + # No minimum signup delay, no bot test. + return false if environment.min_signup_delay == 0 + + # answering captcha, may be human! + return false if params[:recaptcha_response_field] + + # never set signup_time, hi wget! + signup_start_time = get_signup_start_time + return true if signup_start_time.nil? + + # so fast, so bot. + signup_start_time > ( Time.now - environment.min_signup_delay.seconds ) + end + def check_answer unless answer_correct @enterprise.block diff --git a/app/controllers/public/catalog_controller.rb b/app/controllers/public/catalog_controller.rb index 5cde9e3..cd75f73 100644 --- a/app/controllers/public/catalog_controller.rb +++ b/app/controllers/public/catalog_controller.rb @@ -7,7 +7,7 @@ class CatalogController < PublicController def index @category = params[:level] ? ProductCategory.find(params[:level]) : nil @products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page]) - @categories = ProductCategory.on_level(params[:level]) + @categories = ProductCategory.on_level(params[:level]).order(:name) end protected diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index db14797..9fbfa95 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,6 +30,12 @@ module ApplicationHelper include AccountHelper + include BlogHelper + + include ContentViewerHelper + + include LayoutHelper + def locale (@page && !@page.language.blank?) ? @page.language : FastGettext.locale end @@ -352,10 +358,6 @@ module ApplicationHelper end end - def theme_stylesheet_path - theme_path + '/style.css' - end - def current_theme @current_theme ||= begin @@ -493,23 +495,24 @@ module ApplicationHelper def profile_cat_icons( profile ) if profile.class == Enterprise - icons = - profile.product_categories.map{ |c| c.size > 1 ? c[1] : nil }. - compact.uniq.map{ |c| - cat_name = c.gsub( /[-_\s,.;'"]+/, '_' ) - cat_icon = "/images/icons-cat/#{cat_name}.png" - if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon - cat_icon = '/images/icons-cat/undefined.png' - end - content_tag 'span', - content_tag( 'span', c ), - :title => c, - :class => 'product-cat-icon cat_icon_' + cat_name, - :style => "background-image:url(#{cat_icon})" - }.join "\n" - content_tag 'div', - content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons, - :class => 'product-category-icons' + icons = profile.product_categories.map{ |c| c.size > 1 ? c[1] : nil }. + compact.uniq.map do |c| + cat_name = c.gsub( /[-_\s,.;'"]+/, '_' ) + cat_icon = "/images/icons-cat/#{cat_name}.png" + if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon + cat_icon = '/images/icons-cat/undefined.png' + end + content_tag('span', + content_tag( 'span', c ), + :title => c, + :class => 'product-cat-icon cat_icon_' + cat_name, + :style => "background-image:url(#{cat_icon})" + ) + end.join("\n").html_safe + content_tag('div', + content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons, + :class => 'product-category-icons' + ) else '' end @@ -633,10 +636,10 @@ module ApplicationHelper # FIXME ([toplevel] + toplevel.children_for_menu).each do |cat| if cat.top_level? - result << '
' + result << '
'.html_safe result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' ) result << content_tag('h5', toplevel.name) - result << '
    ' + result << '
      '.html_safe else checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+|\//, '_')}" result << content_tag('li', labelled_check_box( @@ -647,7 +650,7 @@ module ApplicationHelper :class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n" end end - result << '
' + result << '
'.html_safe end content_tag('div', result) @@ -787,10 +790,10 @@ module ApplicationHelper :class => 'lineitem' + (line_item+=1).to_s() ) +"\n" if line_item == line_size line_item = 0 - html += "
\n" + html += "
\n".html_safe end } - html += "
\n" if line_size == 0 || ( values.size % line_size ) > 0 + html += "
\n".html_safe if line_size == 0 || ( values.size % line_size ) > 0 column = object.class.columns_hash[method.to_s] text = ( column ? @@ -873,14 +876,6 @@ module ApplicationHelper content_tag('div', labelled_check_box(_('Public'), 'profile_data[fields_privacy]['+name+']', 'public', profile.public_fields.include?(name)), :class => 'field-privacy-selector') end - def template_stylesheet_path - if profile.nil? - "/designs/templates/#{environment.layout_template}/stylesheets/style.css" - else - "/designs/templates/#{profile.layout_template}/stylesheets/style.css" - end - end - def login_url options = Noosfero.url_options.merge({ :controller => 'account', :action => 'login' }) url_for(options) @@ -919,18 +914,6 @@ module ApplicationHelper end end - def icon_theme_stylesheet_path - icon_themes = [] - theme_icon_themes = theme_option(:icon_theme) || [] - for icon_theme in theme_icon_themes do - theme_path = "/designs/icons/#{icon_theme}/style.css" - if File.exists?(File.join(RAILS_ROOT, 'public', theme_path)) - icon_themes << theme_path - end - end - icon_themes - end - def page_title (@page ? @page.title + ' - ' : '') + (profile ? profile.short_name + ' - ' : '') + @@ -942,42 +925,13 @@ module ApplicationHelper (@category ? " - #{@category.full_name}" : '') end - def noosfero_javascript - render :file => 'layouts/_javascript' - end - - def noosfero_stylesheets - [ - 'application', - 'search', - 'thickbox', - 'lightbox', - 'colorpicker', - 'colorbox', - pngfix_stylesheet_path, - ] + - tokeninput_stylesheets - end - # DEPRECATED. Do not use this· def import_controller_stylesheets(options = {}) stylesheet_import( "controller_"+ @controller.controller_name(), options ) end - def pngfix_stylesheet_path - 'iepngfix/iepngfix.css' - end - - def tokeninput_stylesheets - ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet'] - end - - def noosfero_layout_features - render :file => 'shared/noosfero_layout_features' - end - def link_to_email(email) - javascript_tag('var array = ' + email.split('@').to_json + '; document.write("" + array.join("@") + "")') + javascript_tag('var array = ' + email.split('@').to_json + '; document.write("" + array.join("@") + "")'.html_safe) end def stylesheet(*args) @@ -987,13 +941,43 @@ module ApplicationHelper def article_to_html(article, options = {}) options.merge!(:page => params[:npage]) content = article.to_html(options) - content = content.kind_of?(Proc) ? self.instance_eval(&content) : content + content = content.kind_of?(Proc) ? self.instance_eval(&content).html_safe : content.html_safe @plugins && @plugins.each do |plugin| content = plugin.parse_content(content) end content end + # Please, use link_to by default! + # This method was created to work around to inexplicable + # chain of problems when display_short_format was called + # from Article model for an ArticleBlock. + def reference_to_article(text, article, anchor=nil) + if article.profile.domains.empty? + href = "/#{article.url[:profile]}/" + else + href = "http://#{article.profile.domains.first.name}/" + end + href += article.url[:page].join('/') + href += '#' + anchor if anchor + content_tag('a', text, :href => href) + end + + def display_short_format(article, options={}) + options[:comments_link] ||= true + options[:read_more_link] ||= true + html = content_tag('div', + article.lead + + content_tag('div', + (options[:comments_link] ? link_to_comments(article) : '') + + (options[:read_more_link] ? reference_to_article( _('Read more'), article) : ''), + :class => 'read-more' + ), + :class => 'short-post' + ) + html + end + def colorpicker_field(object_name, method, options = {}) text_field(object_name, method, options.merge(:class => 'colorpicker_field')) end @@ -1003,7 +987,7 @@ module ApplicationHelper end def ui_icon(icon_class, extra_class = '') - "" + "".html_safe end def ui_button(label, url, html_options = {}) @@ -1018,10 +1002,6 @@ module ApplicationHelper theme_option(:jquery_theme) || 'smoothness_mod' end - def jquery_ui_theme_stylesheet_path - 'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom' - end - def ui_error(message) content_tag('div', ui_icon('ui-icon-alert') + message, :class => 'alert fg-state-error ui-state-error') end @@ -1035,13 +1015,13 @@ module ApplicationHelper end def collapsed_item_icon - "" + "".html_safe end def expanded_item_icon - "" + "".html_safe end def leaf_item_icon - "" + "".html_safe end def display_category_menu(block, categories, root = true) @@ -1300,9 +1280,7 @@ module ApplicationHelper titles = tabs.inject(''){ |result, tab| result << content_tag(:li, link_to(tab[:title], '#'+tab[:id]), :class => 'tab') } contents = tabs.inject(''){ |result, tab| result << content_tag(:div, tab[:content], :id => tab[:id]) } - content_tag :div, :class => 'ui-tabs' do - content_tag(:ul, titles) + contents - end + content_tag(:div, content_tag(:ul, titles) + raw(contents), :class => 'ui-tabs') end def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...')) @@ -1331,11 +1309,12 @@ module ApplicationHelper end def template_options(klass, field_name) - return '' if klass.templates.count == 0 - return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1 + templates = klass.templates(environment) + return '' if templates.count == 0 + return hidden_field_tag("#{field_name}[template_id]", templates.first.id) if templates.count == 1 counter = 0 - radios = klass.templates.map do |template| + radios = templates.map do |template| counter += 1 content_tag('li', labelled_radio_button(link_to(template.name, template.url, :target => '_blank'), "#{field_name}[template_id]", template.id, counter==1)) end.join("\n") @@ -1423,4 +1402,14 @@ module ApplicationHelper @no_design_blocks = true end + def default_folder_for_image_upload(profile) + default_folder = profile.folders.find_by_type('Gallery') + default_folder = profile.folders.find_by_type('Folder') if default_folder.nil? + default_folder + end + + def content_id_to_str(content) + content.nil? ? '' : content.id.to_s + end + end diff --git a/app/helpers/block_helper.rb b/app/helpers/block_helper.rb index 8fbe47f..b416253 100644 --- a/app/helpers/block_helper.rb +++ b/app/helpers/block_helper.rb @@ -3,7 +3,7 @@ module BlockHelper def block_title(title) tag_class = 'block-title' tag_class += ' empty' if title.empty? - content_tag 'h3', content_tag('span', title), :class => tag_class + content_tag 'h3', content_tag('span', h(title)), :class => tag_class end end diff --git a/app/helpers/blog_helper.rb b/app/helpers/blog_helper.rb index 407d399..3e39cd9 100644 --- a/app/helpers/blog_helper.rb +++ b/app/helpers/blog_helper.rb @@ -18,8 +18,9 @@ module BlogHelper pagination = will_paginate(articles, { :param_name => 'npage', :previous_label => _('« Newer posts'), - :next_label => _('Older posts »') - }) + :next_label => _('Older posts »'), + :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"} + }) if articles.present? content = [] artic_len = articles.length articles.each_with_index{ |art,i| @@ -46,18 +47,6 @@ module BlogHelper article_title(article, :no_comments => no_comments) + html end - def display_short_format(article) - html = content_tag('div', - article.lead + - content_tag('div', - link_to_comments(article) + - link_to( _('Read more'), article.url), - :class => 'read-more'), - :class => 'short-post' - ) - html - end - def display_full_format(article) html = article_to_html(article) html = content_tag('p', html) if ! html.include?('

') diff --git a/app/helpers/catalog_helper.rb b/app/helpers/catalog_helper.rb index 99ef1b4..b6c3da1 100644 --- a/app/helpers/catalog_helper.rb +++ b/app/helpers/catalog_helper.rb @@ -21,7 +21,7 @@ module CatalogHelper def category_sub_links(category) sub_categories = [] - category.children.each do |sub_category| + category.children.order(:name).each do |sub_category| sub_categories << category_link(sub_category, true) end content_tag('ul', sub_categories) if sub_categories.size > 1 diff --git a/app/helpers/content_viewer_helper.rb b/app/helpers/content_viewer_helper.rb index f6ba368..b24c01a 100644 --- a/app/helpers/content_viewer_helper.rb +++ b/app/helpers/content_viewer_helper.rb @@ -36,7 +36,7 @@ module ContentViewerHelper def link_to_comments(article, args = {}) return '' unless article.accept_comments? - link_to(number_of_comments(article), article.url.merge(:anchor => 'comments_list') ) + reference_to_article number_of_comments(article), article, 'comments_list' end def article_translations(article) @@ -45,7 +45,7 @@ module ContentViewerHelper { article.environment.locales[translation.language] => { :href => url_for(translation.url) } } end content_tag(:div, link_to(_('Translations'), '#', - :onclick => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false", + :onmouseover => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false", :class => 'article-translations-menu simplemenu-trigger up'), :class => 'article-translations') end diff --git a/app/helpers/dates_helper.rb b/app/helpers/dates_helper.rb index 46ea061..57dc611 100644 --- a/app/helpers/dates_helper.rb +++ b/app/helpers/dates_helper.rb @@ -23,11 +23,13 @@ module DatesHelper end # formats a date for displaying. - def show_date(date, use_numbers = false) + def show_date(date, use_numbers = false, year=true) if date && use_numbers - _('%{month}/%{day}/%{year}') % { :day => date.day, :month => date.month, :year => date.year } + date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}') + date_format % { :day => date.day, :month => date.month, :year => date.year } elsif date - _('%{month} %{day}, %{year}') % { :day => date.day, :month => month_name(date.month), :year => date.year } + date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}') + date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year } else '' end @@ -46,7 +48,27 @@ module DatesHelper if (date1 == date2) || (date2.nil?) show_date(date1, use_numbers) else - _('from %{date1} to %{date2}') % {:date1 => show_date(date1, use_numbers), :date2 => show_date(date2, use_numbers)} + if date1.year == date2.year + if date1.month == date2.month + _('from %{month} %{day1} to %{day2}, %{year}') % { + :day1 => date1.day, + :day2 => date2.day, + :month => use_numbers ? date1.month : month_name(date1.month), + :year => date1.year + } + else + _('from %{date1} to %{date2}, %{year}') % { + :date1 => show_date(date1, use_numbers, false), + :date2 => show_date(date2, use_numbers, false), + :year => date1.year + } + end + else + _('from %{date1} to %{date2}') % { + :date1 => show_date(date1, use_numbers), + :date2 => show_date(date2, use_numbers) + } + end end end diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb index 7060678..f5bc211 100644 --- a/app/helpers/forms_helper.rb +++ b/app/helpers/forms_helper.rb @@ -142,38 +142,6 @@ module FormsHelper content_tag('table',rows.join("\n")) end - def select_folder(label_text, field_id, collection, default_value=nil, html_options = {}, js_options = {}) - root = profile ? profile.identifier : _("root") - labelled_form_field( - label_text, - select_tag( - field_id, - options_for_select( - [[root, '']] + - collection.collect {|f| [ root + '/' + f.full_name, f.id ] }, - default_value - ), - html_options.merge(js_options) - ) - ) - end - - def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {}) - result = labelled_form_field( - label_text, - select_tag( - field_id, - options_for_select( - [[profile.identifier, '']] + - profile.folders.collect {|f| [ profile.identifier + '/' + f.full_name, f.id ] }, - default_value - ), - html_options.merge(js_options) - ) - ) - return result - end - def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {}) datepicker_options[:disabled] ||= false datepicker_options[:alt_field] ||= '' @@ -295,23 +263,28 @@ module FormsHelper field_id, options_for_select( [[root, '']] + - collection.collect {|f| [ root + '/' + f.full_name, f.id ] }, - default_value + collection.collect {|f| [ root + '/' + f.full_name, f.id.to_s ] }, + default_value.to_s ), html_options.merge(js_options) ) ) end - def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {}) + def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {}, find_options = {}) + if find_options.empty? + folders = profile.folders + else + folders = profile.folders.where(find_options) + end result = labelled_form_field( label_text, select_tag( field_id, options_for_select( [[profile.identifier, '']] + - profile.folders.collect {|f| [ profile.identifier + '/' + f.full_name, f.id ] }, - default_value + folders.collect {|f| [ profile.identifier + '/' + f.full_name, f.id.to_s ] }, + default_value.to_s ), html_options.merge(js_options) ) diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb new file mode 100644 index 0000000..4a223a5 --- /dev/null +++ b/app/helpers/layout_helper.rb @@ -0,0 +1,88 @@ +module LayoutHelper + + def body_classes + # Identify the current controller and action for the CSS: + " controller-#{@controller.controller_name}" + + " action-#{@controller.controller_name}-#{@controller.action_name}" + + " template-#{profile.nil? ? "default" : profile.layout_template}" + + (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "") + end + + def noosfero_javascript + plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten + + output = '' + output += render :file => 'layouts/_javascript' + output += javascript_tag 'render_all_jquery_ui_widgets()' + unless plugins_javascripts.empty? + output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}" + end + output + end + + def noosfero_stylesheets + standard_stylesheets = [ + 'application', + 'search', + 'thickbox', + 'lightbox', + 'colorpicker', + 'colorbox', + pngfix_stylesheet_path, + ] + tokeninput_stylesheets + plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') } + + output = '' + output += stylesheet_link_tag standard_stylesheets, :cache => 'cache' + output += stylesheet_link_tag template_stylesheet_path + output += stylesheet_link_tag icon_theme_stylesheet_path + output += stylesheet_link_tag jquery_ui_theme_stylesheet_path + unless plugins_stylesheets.empty? + output += stylesheet_link_tag plugins_stylesheets, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}" + end + output += stylesheet_link_tag theme_stylesheet_path + output + end + + def pngfix_stylesheet_path + 'iepngfix/iepngfix.css' + end + + def tokeninput_stylesheets + ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet'] + end + + def noosfero_layout_features + render :file => 'shared/noosfero_layout_features' + end + + def template_stylesheet_path + if profile.nil? + "/designs/templates/#{environment.layout_template}/stylesheets/style.css" + else + "/designs/templates/#{profile.layout_template}/stylesheets/style.css" + end + end + + def icon_theme_stylesheet_path + icon_themes = [] + theme_icon_themes = theme_option(:icon_theme) || [] + for icon_theme in theme_icon_themes do + theme_path = "/designs/icons/#{icon_theme}/style.css" + if File.exists?(File.join(RAILS_ROOT, 'public', theme_path)) + icon_themes << theme_path + end + end + icon_themes + end + + def jquery_ui_theme_stylesheet_path + 'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom' + end + + def theme_stylesheet_path + theme_path + '/style.css' + end + +end + diff --git a/app/helpers/profile_editor_helper.rb b/app/helpers/profile_editor_helper.rb index 7cb999e..9479418 100644 --- a/app/helpers/profile_editor_helper.rb +++ b/app/helpers/profile_editor_helper.rb @@ -136,7 +136,7 @@ module ProfileEditorHelper concat( content_tag( 'div', - capture(&block) + '
 ', + capture(&block) + content_tag('br', '', :style => 'clear: left'), :class => 'control-panel') ) end diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index a0096e3..6139018 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -68,7 +68,7 @@ module TagsHelper :title => n_( 'one item', '%d items', count ) % count end - end.join("\n") + end.join("\n").html_safe end end diff --git a/app/models/article.rb b/app/models/article.rb index 57d3781..a806117 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -2,6 +2,9 @@ require 'hpricot' class Article < ActiveRecord::Base + #FIXME This is necessary because html is being generated on the model... + include ActionView::Helpers::TagHelper + # use for internationalizable human type names in search facets # reimplement on subclasses def self.type_name @@ -236,8 +239,13 @@ class Article < ActiveRecord::Base # The implementation in this class just provides the +body+ attribute as the # HTML. Other article types can override this method to provide customized # views of themselves. + # (To override short format representation, override the lead method) def to_html(options = {}) - body || '' + if options[:format] == 'short' + display_short_format(self) + else + body || '' + end end include ApplicationHelper diff --git a/app/models/article_block.rb b/app/models/article_block.rb index bb802be..e30a9c8 100644 --- a/app/models/article_block.rb +++ b/app/models/article_block.rb @@ -12,7 +12,11 @@ class ArticleBlock < Block block = self lambda do block_title(block.title) + - (block.article ? article_to_html(block.article, :gallery_view => false) : _('Article not selected yet.')) + (block.article ? article_to_html(block.article, + :gallery_view => false, + :inside_block => block, # For Blogs and folders + :format => block.visualization_format # For Articles and contents + ).html_safe : _('Article not selected yet.')) end end @@ -49,4 +53,14 @@ class ArticleBlock < Block self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles end + def posts_per_page + self.settings[:posts_per_page] or 1 + end + + def posts_per_page= value + value = value.to_i + self.settings[:posts_per_page] = value if value > 0 + end + + settings_items :visualization_format, :type => :string, :default => 'short' end diff --git a/app/models/blog.rb b/app/models/blog.rb index 88d2189..71e0501 100644 --- a/app/models/blog.rb +++ b/app/models/blog.rb @@ -24,8 +24,9 @@ class Blog < Folder # FIXME isn't this too much including just to be able to generate some HTML? include ActionView::Helpers::TagHelper def to_html(options = {}) + me = self lambda do - render :file => 'content_viewer/blog_page' + render :file => 'content_viewer/blog_page', :locals => { :blog=>me, :inside_block=>options[:inside_block] } end end diff --git a/app/models/environment.rb b/app/models/environment.rb index 3fa8509..6f31f8f 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -233,6 +233,7 @@ class Environment < ActiveRecord::Base settings[:message_for_member_invitation] || InviteMember.mail_template end + settings_items :min_signup_delay, :type => Integer, :default => 3 #seconds settings_items :activation_blocked_text, :type => String settings_items :message_for_disabled_enterprise, :type => String, :default => _('This enterprise needs to be enabled.') @@ -617,12 +618,10 @@ class Environment < ActiveRecord::Base end def top_url - protocol = 'http' - result = "#{protocol}://#{default_hostname}" - if Noosfero.url_options.has_key?(:port) - result << ':' << Noosfero.url_options[:port].to_s - end - result + url = 'http://' + url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname) + url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port) + url end def to_s diff --git a/app/models/event.rb b/app/models/event.rb index a2f24e4..6f88de4 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -104,18 +104,30 @@ class Event < Article } } + # TODO: some good soul, please clean this ugly hack: if self.body html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description') end } if self.body - result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body) + if options[:format] == 'short' + result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self)) + else + result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body) + end end result end + def lead + content_tag('div', + show_period(start_date, end_date), + :class => 'event-dates' + ) + super + end + def event? true end diff --git a/app/models/feed_reader_block.rb b/app/models/feed_reader_block.rb index 3ab06ff..142aedf 100644 --- a/app/models/feed_reader_block.rb +++ b/app/models/feed_reader_block.rb @@ -47,11 +47,11 @@ class FeedReaderBlock < Block def formatted_feed_content if error_message.blank? - "
    \n" + - self.feed_items[0..(limit-1)].map{ |item| "
  • #{item[:title]}
    • " }.join("\n") + - "
" + "
    \n".html_safe + + self.feed_items[0..(limit-1)].map{ |item| "
  • #{item[:title]}
    • " }.join("\n").html_safe + + "
".html_safe else - '

' + error_message + '

' + "

#{error_message}

".html_safe end end diff --git a/app/models/link_list_block.rb b/app/models/link_list_block.rb index 586f844..39267e6 100644 --- a/app/models/link_list_block.rb +++ b/app/models/link_list_block.rb @@ -80,7 +80,7 @@ class LinkListBlock < Block def icons_options ICONS.map do |i| - "" + "".html_safe end end diff --git a/app/models/organization_mailing.rb b/app/models/organization_mailing.rb index 9cf9d86..ddd9fb3 100644 --- a/app/models/organization_mailing.rb +++ b/app/models/organization_mailing.rb @@ -5,7 +5,7 @@ class OrganizationMailing < Mailing end def recipients(offset=0, limit=100) - source.members.all(:order => self.id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil }) + source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil }) end def each_recipient diff --git a/app/models/profile.rb b/app/models/profile.rb index 4a11192..48ed800 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -68,7 +68,7 @@ class Profile < ActiveRecord::Base #FIXME: these will work only if the subclass is already loaded named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} } named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} } - named_scope :templates, :conditions => {:is_template => true} + named_scope :templates, lambda { |environment| { :conditions => {:is_template => true, :environment_id => environment.id} } } def members scopes = plugins.dispatch_scopes(:organization_members, self) diff --git a/app/models/profile_list_block.rb b/app/models/profile_list_block.rb index ad1371e..d5f8e91 100644 --- a/app/models/profile_list_block.rb +++ b/app/models/profile_list_block.rb @@ -49,13 +49,12 @@ class ProfileListBlock < Block send(:profile_image_link, item, :minor ) }.join("\n ") if list.empty? - list = '
'+ _('None') +'
' + list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none' else list = content_tag 'ul', nl +' '+ list + nl end block_title(title) + nl + - '
' + - nl + list + nl + '
' + content_tag('div', nl + list + nl + content_tag('br', '', :style => 'clear:both')) end end diff --git a/app/models/spammer_logger.rb b/app/models/spammer_logger.rb index 671c6cd..5ab87e4 100644 --- a/app/models/spammer_logger.rb +++ b/app/models/spammer_logger.rb @@ -5,10 +5,10 @@ class SpammerLogger < Logger def self.log(spammer_ip, object=nil) if object if object.kind_of?(Comment) - @logger << "[#{Time.now.strftime("%F %T %z")}] Comment-id: #{object.id} IP: #{spammer_ip}\n" + @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n" end else - @logger << "[#{Time.now.strftime("%F %T %z")}] IP: #{spammer_ip}\n" + @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n" end end diff --git a/app/models/tags_block.rb b/app/models/tags_block.rb index c034dc6..8446b11 100644 --- a/app/models/tags_block.rb +++ b/app/models/tags_block.rb @@ -20,7 +20,8 @@ class TagsBlock < Block end def content(args={}) - tags = owner.article_tags + is_env = owner.class == Environment + tags = is_env ? owner.tag_counts : owner.article_tags return '' if tags.empty? if limit @@ -29,18 +30,28 @@ class TagsBlock < Block tags_tmp.map{ |k,v| tags[k] = v } end + url = is_env ? {:host=>owner.default_hostname, :controller=>'search', :action => 'tag'} : + owner.public_profile_url.merge(:controller => 'profile', :action => 'tags') + tagname_option = is_env ? :tag : :id + block_title(title) + - "\n
\n"+ - tag_cloud( tags, :id, - owner.public_profile_url.merge(:controller => 'profile', :action => 'tags'), - :max_size => 16, :min_size => 9 ) + - "\n
\n"; + "\n
\n".html_safe+ + tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) + + "\n
\n".html_safe end def footer - owner_id = owner.identifier - lambda do - link_to s_('tags|View all'), :profile => owner_id, :controller => 'profile', :action => 'tags' + if owner.class == Environment + lambda do + link_to s_('tags|View all'), + :controller => 'search', :action => 'tags' + end + else + owner_id = owner.identifier + lambda do + link_to s_('tags|View all'), + :profile => owner_id, :controller => 'profile', :action => 'tags' + end end end diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb index caa30b6..5be009e 100644 --- a/app/models/uploaded_file.rb +++ b/app/models/uploaded_file.rb @@ -113,7 +113,7 @@ class UploadedFile < Article content_tag( 'div', - link_to_previous + content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images] + link_to_next, + link_to_previous + (content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images]).html_safe + link_to_next, :class => 'gallery-navigation' ) end.to_s + diff --git a/app/models/user.rb b/app/models/user.rb index 888f068..6ddd9ee 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -15,7 +15,7 @@ class User < ActiveRecord::Base # FIXME ugly workaround def self.human_attribute_name(attrib) case attrib.to_sym - when :login: return _('Username') + when :login: return [_('Username'), _('Email')].join(' / ') when :email: return _('e-Mail') else _(self.superclass.human_attribute_name(attrib)) end @@ -116,10 +116,11 @@ class User < ActiveRecord::Base validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n - # Authenticates a user by their login name and unencrypted password. Returns the user or nil. + # Authenticates a user by their login name or email and unencrypted password. Returns the user or nil. def self.authenticate(login, password, environment = nil) environment ||= Environment.default - u = first :conditions => ['login = ? AND environment_id = ? AND activated_at IS NOT NULL', login, environment.id] # need to get the salt + u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL', + login, login, environment.id] # need to get the salt u && u.authenticated?(password) ? u : nil end diff --git a/app/views/account/_signup_form.rhtml b/app/views/account/_signup_form.rhtml index 560be5b..ee58cfa 100644 --- a/app/views/account/_signup_form.rhtml +++ b/app/views/account/_signup_form.rhtml @@ -1,8 +1,27 @@ +<% if @block_bot %> +
+ <%=_('Are you a robot?')%>
+ <%=_('Please, prove that you are human by filling the captcha.')%> +
+<% end %> + <% @profile_data = @person %> <%= error_messages_for :user, :person, :header_message => _('The account could not be created') %> -<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %> +<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form', :honeypot => true } do |f| %> + + + <%= hidden_field_tag :invitation_code, @invitation_code %> @@ -13,7 +32,8 @@ <%= environment.default_hostname %>/
- <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %> + <%= required text_field(:user, :login, :id => 'user_login', + :onchange => 'this.value = convToValidUsername(this.value);') %>

 

<%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %> @@ -97,6 +117,8 @@ <% end %>
+<%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} if @block_bot %> +

<%= submit_button('save', _('Create my account')) %>

diff --git a/app/views/account/forgot_password.rhtml b/app/views/account/forgot_password.rhtml index 537c9f4..1e3748d 100644 --- a/app/views/account/forgot_password.rhtml +++ b/app/views/account/forgot_password.rhtml @@ -5,7 +5,7 @@ <% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %> <%= f.text_field :login, - :onchange => 'this.value = convToValidLogin( this.value )' %> + :onchange => 'this.value = convToValidUsername( this.value )' %> <%= f.text_field :email %> diff --git a/app/views/admin_panel/site_info.rhtml b/app/views/admin_panel/site_info.rhtml index b8df356..4ab7f2f 100644 --- a/app/views/admin_panel/site_info.rhtml +++ b/app/views/admin_panel/site_info.rhtml @@ -4,7 +4,7 @@ <%= render :file => 'shared/tiny_mce' %> -<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %> +<% labelled_form_for :environment, @environment do |f| %> <% tabs = [] %> <% tabs << {:title => _('Site info'), :id => 'site-info', :content => (render :partial => 'site_info', :locals => {:f => f})} %> diff --git a/app/views/box_organizer/_article_block.rhtml b/app/views/box_organizer/_article_block.rhtml index 5de82d8..9b26c5c 100644 --- a/app/views/box_organizer/_article_block.rhtml +++ b/app/views/box_organizer/_article_block.rhtml @@ -1,10 +1,41 @@ -
+
<% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %> -

+

<%= _("You don't have an community defined as the portal community. Define it before use this block properly.") %>

<% else %> - <% articles = @block.available_articles.select {|article| !article.folder? } %> - <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]}, @block.article ? @block.article.id : nil)) %> + <% + articles = @block.available_articles.select {|a| !a.folder? || a.blog? } + first_text = articles[articles.find_index{|a| a.kind_of? TextArticle}||-1] + selected = @block.article || first_text + %> + <%= select_tag( + 'block[article_id]', + options_for_select_with_title(articles.map {|item| [item.path, item.id]}, selected.id), + :onchange => 'this.changedTo(this.value)' + )%> + + <%= labelled_form_field( + _('How to display this content:'), + select_tag( + 'block[visualization_format]', + options_for_select([[_('Lead'), 'short'], [_('Full post'), 'full']], @block.visualization_format) + ) + )%> + <% blogs = @block.available_articles.select{|a|a.blog?} %> + <% end %>
diff --git a/app/views/box_organizer/_highlights_block.rhtml b/app/views/box_organizer/_highlights_block.rhtml index 90be8b3..1d2d42d 100644 --- a/app/views/box_organizer/_highlights_block.rhtml +++ b/app/views/box_organizer/_highlights_block.rhtml @@ -5,7 +5,7 @@ <% for image in @block.images do %> - <%= select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i), :style => "width: 100px" %>

+ <%= select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe, :style => "width: 100px" %>

<%= text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 10 %> <%= text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 3 %> @@ -17,7 +17,7 @@ <%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page| page.insert_html :bottom, 'highlights', content_tag('tr', - content_tag('td', select_tag('block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name), :style => "width: 100px")) + + content_tag('td', select_tag('block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name).html_safe, :style => "width: 100px")) + content_tag('td', text_field_tag('block[images][][address]', nil, :class => 'highlight-address', :size => 10)) + content_tag('td', text_field_tag('block[images][][position]', nil, :class => 'highlight-position', :size => 3)) + content_tag('td', text_field_tag('block[images][][title]', nil, :class => 'highlight-position', :size => 10)) diff --git a/app/views/catalog/index.rhtml b/app/views/catalog/index.rhtml index bdfec1c..34fd648 100644 --- a/app/views/catalog/index.rhtml +++ b/app/views/catalog/index.rhtml @@ -7,13 +7,16 @@
    - <% if @categories.size > 0 %> + <%= content_tag('li', link_to(_('Enterprise homepage'), profile.public_profile_url), :id => 'catalog-categories-homepage-link') %> + <% if @categories.present? %> <% @categories.each do |category| %> <%= category_link(category) %> <%= category_sub_links(category) %> <% end %> + <% elsif @category.present? %> + <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :id => 'catalog-categories-notice') %> <% else %> - <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :style => 'color: #555753; padding-bottom: 0.5em;') %> + <%= content_tag('li', _('There are no categories available.'), :id => 'catalog-categories-notice') %> <% end %>
diff --git a/app/views/cms/_text_editor_sidebar.rhtml b/app/views/cms/_text_editor_sidebar.rhtml index e67dc5a..dd88dcc 100644 --- a/app/views/cms/_text_editor_sidebar.rhtml +++ b/app/views/cms/_text_editor_sidebar.rhtml @@ -9,7 +9,12 @@
<% form_tag({ :action => 'media_upload' }, :multipart => true) do %>
- <%= select_profile_folder(_('Choose folder to upload files:'), :parent_id, profile) %> + <% default_folder = content_id_to_str default_folder_for_image_upload(profile) %> + <%= select_profile_folder( + _('Choose folder to upload files:'), + :parent_id, profile, default_folder, {}, {}, + 'type="Folder" or type="Gallery"' + ) %>

<%= file_field_tag('file1') %>

<%= file_field_tag('file2') %>

diff --git a/app/views/content_viewer/_comment_form.rhtml b/app/views/content_viewer/_comment_form.rhtml index c19a877..423d44e 100644 --- a/app/views/content_viewer/_comment_form.rhtml +++ b/app/views/content_viewer/_comment_form.rhtml @@ -21,8 +21,6 @@ function submit_comment_form(button) { } -<% focus_on = logged_in? ? 'title' : 'name' %> - <% if @comment && @comment.errors.any? && @comment.reply_of_id.blank? %> <%= error_messages_for :comment %> @@ -32,17 +30,7 @@ function submit_comment_form(button) {
-<% if display_link %> -

- <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %> -

-<% end %> + <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link %> <% unless pass_without_comment_captcha? %> + +<%= javascript_include_tag 'comment_form'%> diff --git a/app/views/content_viewer/blog_page.rhtml b/app/views/content_viewer/blog_page.rhtml index 4eba287..d48ec35 100644 --- a/app/views/content_viewer/blog_page.rhtml +++ b/app/views/content_viewer/blog_page.rhtml @@ -1,13 +1,21 @@ -<% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.blog? && @page.feed %> +<% add_rss_feed_to_head(blog.name, blog.feed.url) if blog.blog? && blog.feed %> -<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if @page.blog? && @page.external_feed && @page.external_feed.enabled && @page.external_feed.fetched_at.nil? %> +<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if blog.blog? && blog.external_feed && blog.external_feed.enabled && blog.external_feed.fetched_at.nil? %>
- <%= @page.body %> + <%= blog.body %>
- <%= (@page.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %> + <%= + posts = @posts + format = blog.visualization_format + if inside_block + posts = blog.posts.paginate(:page=>1, :per_page=>inside_block.posts_per_page) + format = inside_block.visualization_format + end + (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, format)) + %>
diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml index 15023a4..31c7e75 100644 --- a/app/views/content_viewer/view_page.rhtml +++ b/app/views/content_viewer/view_page.rhtml @@ -90,7 +90,7 @@ <% end %> <% if @page.accept_comments? && @comments_count > 1 %> -

<%= _('Post a comment') %>

+ <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form', :id => 'top-post-comment-button') %> <% end %>
    diff --git a/app/views/favorite_enterprises/index.rhtml b/app/views/favorite_enterprises/index.rhtml index aded584..3fdd2cb 100644 --- a/app/views/favorite_enterprises/index.rhtml +++ b/app/views/favorite_enterprises/index.rhtml @@ -5,7 +5,7 @@
      <% @favorite_enterprises.each do |enterprise| %>
    • - <%= link_to_profile profile_image(enterprise) + '
      ' + enterprise.name, + <%= link_to_profile profile_image(enterprise) + '
      '.html_safe + enterprise.name, enterprise.identifier, :class => 'profile-link' %> <%# profile_image_link enterprise, :portrait, 'div' %>
      diff --git a/app/views/layouts/_user.html.erb b/app/views/layouts/_user.html.erb new file mode 100644 index 0000000..9734998 --- /dev/null +++ b/app/views/layouts/_user.html.erb @@ -0,0 +1,24 @@ +
      + + + +
      diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml index 480e3f9..dcf6179 100644 --- a/app/views/layouts/application-ng.rhtml +++ b/app/views/layouts/application-ng.rhtml @@ -8,38 +8,19 @@ <%= noosfero_javascript %> - <%= stylesheet_link_tag noosfero_stylesheets, :cache => 'cache' %> - <%= stylesheet_link_tag template_stylesheet_path %> - <%= stylesheet_link_tag icon_theme_stylesheet_path %> - <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %> - <% - plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') } - %> - <%= stylesheet_link_tag(plugins_stylesheets, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_stylesheets.to_s)) unless plugins_stylesheets.empty? %> - <%= stylesheet_link_tag theme_stylesheet_path %> + <%= noosfero_stylesheets %> <%# Add custom tags/styles/etc via content_for %> <%= yield :head %> - <%= javascript_tag('render_all_jquery_ui_widgets()') %> - <% - plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten - %> - <%= javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? %> <%= @plugins.dispatch(:head_ending).collect do |content| content.respond_to?(:call) ? content.call : content end.join("\n") %> - " > - + <%= _("Go to the content") %> + <%= @plugins.dispatch(:body_beginning).collect do |content| content.respond_to?(:call) ? content.call : content @@ -51,30 +32,7 @@ <%= theme_header %>
      -
      - - -
      - -
      <%=_('Press Enter to send the search query.')%>
      - <%= javascript_tag 'jQuery("#user form input").hint();' %> -
      -
      + <%= render :partial => 'layouts/user' %>

      <%= theme_site_title %> diff --git a/app/views/profile/_profile_wall.rhtml b/app/views/profile/_profile_wall.rhtml index f0601f9..25727a4 100644 --- a/app/views/profile/_profile_wall.rhtml +++ b/app/views/profile/_profile_wall.rhtml @@ -1,7 +1,7 @@

      <%= _("%s's wall") % @profile.name %>

      <%= flash[:error] %> - <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %> + <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %> <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %> <%= submit_button :new, _('Share') %> <% end %> diff --git a/app/views/profile_members/_manage_roles.html.erb b/app/views/profile_members/_manage_roles.html.erb index 49d756d..4d04d89 100644 --- a/app/views/profile_members/_manage_roles.html.erb +++ b/app/views/profile_members/_manage_roles.html.erb @@ -13,11 +13,11 @@ <% @roles.each do |role| %> <% search_url = url_for(:action => 'search_user', :profile => profile.identifier, :role => role.id) %> - <% @pre_population ||= profile.members_by_role_to_json(role) %> + <% pre_population = params[:action] == 'last_admin' ? [].to_json : profile.members_by_role_to_json(role) %> - -<% end %> diff --git a/plugins/mezuro/views/content_viewer/_score_history.rhtml b/plugins/mezuro/views/content_viewer/_score_history.rhtml deleted file mode 100644 index ee59fff..0000000 --- a/plugins/mezuro/views/content_viewer/_score_history.rhtml +++ /dev/null @@ -1,2 +0,0 @@ -<%= image_tag(MezuroPlugin::Helpers::ContentViewerHelper.generate_chart(@score_history)) %> - diff --git a/plugins/mezuro/views/content_viewer/_source_tree.rhtml b/plugins/mezuro/views/content_viewer/_source_tree.rhtml deleted file mode 100644 index 8c7b315..0000000 --- a/plugins/mezuro/views/content_viewer/_source_tree.rhtml +++ /dev/null @@ -1,45 +0,0 @@ -<% unless @content.errors[:base].nil? %> - <%= @content.errors[:base] %> -<% else %> -

      <%= _('Source tree') %>

      - <% module_name = @source_tree.module.name %> - <% module_label = "#{module_name} (#{@source_tree.module.granularity})" %> - -

      - <% if module_name != @project_name %> - - <%= @project_name %> - - <% end %> - - - <% split_link = @source_tree.module.ancestor_names %> - <% split_link.each do |link| %> - / - <%= link.split(".").last %> - - <% end %> -

      - - <% if @source_tree.children %> - - <% @source_tree.children.each do |child| %> - <% if child.module.granularity=='PACKAGE' %> - - - - - <% else %> - - - - - <% end %> - <% end %> -
      <%= image_tag('/plugins/mezuro/images/folder.png')%><%= child.module.name %>
      <%= image_tag('/plugins/mezuro/images/file.png') %> - - <%= child.module.name %> - -
      - <% end %> -<% end %> diff --git a/plugins/mezuro/views/content_viewer/show_configuration.rhtml b/plugins/mezuro/views/content_viewer/show_configuration.rhtml index 804aabe..ee63d9e 100644 --- a/plugins/mezuro/views/content_viewer/show_configuration.rhtml +++ b/plugins/mezuro/views/content_viewer/show_configuration.rhtml @@ -1,9 +1,14 @@ <% @configuration_content = @page @kalibro_configuration = @page.kalibro_configuration %> + +<% owner = (not user.nil?) && user.id == @profile.id %> <% unless @page.errors[:base].nil? %> - <% if @page.errors[:base] =~ /There is no configuration named/ %> + <% if @page.errors[:base] =~ /Kalibro::Errors::RecordNotFound/ %>

      Warning:

      -

      This Configuration doesn't exist on the Web Service. Do you want to delete or save it again?

      +

      This Configuration doesn't exist on the Web Service.

      + <% if owner %> +

      Do you want to <%= link_to 'delete', :action => 'destroy', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %> or <%= link_to 'save it again', :action => 'edit', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %>?

      + <% end %> <% else %> <%= @page.errors[:base] %> <% end %> @@ -22,37 +27,50 @@
      - <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_myprofile", - :action => "choose_base_tool", :params => { :id => @configuration_content.id } %>
      + <% if owner %> + <%= link_to "#{image_tag('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_metric_configuration", + :profile => @page.profile.identifier, + :action => "choose_metric", + :id => @configuration_content.id %>
      + <% end %> - + + - <% @kalibro_configuration.metric_configurations.each do |metric_configuration| %> + <% @configuration_content.metric_configurations.each do |metric_configuration| %> - - <% if metric_configuration.metric.instance_of? Kalibro::NativeMetric %> + <% if metric_configuration.metric.compound + edit_action = "edit_compound" + else + edit_action = "edit_native" + end + %> + + <% if metric_configuration.metric.compound %> - - <% else %> - - <% end %> - - + + + + <% if owner %> + + <% end %> <% end %>
      Metric Name
      Collector Name
      Metric Code
      		 +
      Weight
      Aggregation Form
      <%= metric_configuration.metric.name %><%= link_to metric_configuration.metric.name, :controller => "mezuro_plugin_metric_configuration", :action => edit_action, + :metric_configuration_id => metric_configuration.id, :id => @configuration_content.id, + :profile => @page.profile.identifier %> - <%= metric_configuration.metric.origin %> + Compound Metric <%= metric_configuration.code %><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_metric_configuration", :params => - {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %> - Compound Metric + <%= metric_configuration.base_tool_name %> <%= metric_configuration.code %><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_compound_metric_configuration", :params => - {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %><%= link_to "Remove", :controller => "mezuro_plugin_myprofile", :action => "remove_metric_configuration", :params => - {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %><%= metric_configuration.code %><%= metric_configuration.weight %><%= metric_configuration.aggregation_form %><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove", + :metric_configuration_id => metric_configuration.id, :id => @configuration_content.id, + :profile => @page.profile.identifier %>
      diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml index 563cc06..89824a9 100644 --- a/plugins/mezuro/views/content_viewer/show_project.rhtml +++ b/plugins/mezuro/views/content_viewer/show_project.rhtml @@ -1,10 +1,9 @@ - - <% @project = @page.project %> <% unless @page.errors[:base].nil? %> - <% if @page.errors[:base] =~ /There is no project named/ %> + + <% if @page.errors[:base] == "Kalibro::Errors::RecordNotFound" %>

      Warning:

      -

      This project doesn't exist on the Web Service. Do you want to delete or save it again?

      +

      This project doesn't exist on the Web Service. Do you want to <%= link_to 'delete', :action => 'destroy', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %> or <%= link_to 'save it again', :action => 'edit', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %>?

      <% else %> <%= @page.errors[:base] %> <% end %> @@ -16,44 +15,38 @@ <%= @project.name %> - <%= _('License') %> - <%= @project.license %> - - <%= _('Description') %> <%= @project.description %> + +
      +
      <%= _('Repositories') %>
      + + <% @page.repositories.each do |repository| %> - - - - - - - - - - - - - - - - - - - + + + + + <% end %>
      <%= _('Repository type') %><%= @project.repository.type %>
      <%= _('Repository address') %><%= @project.repository.address %>
      <%= _('Configuration') %><%= @project.configuration_name %>
      <%= _('Periodicity') %><%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %>
      <%= _('Status')%> -
      <%= @project.state %>
      -
      -
      <%= link_to repository.name, :controller => "mezuro_plugin_repository", + :profile => @page.profile.identifier, + :action => "show", + :id => @page.id, + :repository_id => repository.id %><%= link_to _('Edit'), {:controller => "mezuro_plugin_repository", + :profile => @page.profile.identifier, + :action => "edit", + :id => @page.id, + :repository_id => repository.id}, :class=>"button with-text icon-edit" %><%= link_to _('Remove'), {:controller => "mezuro_plugin_repository", + :profile => @page.profile.identifier, + :action => "destroy", + :id => @page.id, + :repository_id => repository.id}, :class=>"button with-text icon-delete" %>
      + +
      + <%= link_to "#{image_tag('/plugins/mezuro/images/plus.png')}Add Repository", :controller => "mezuro_plugin_repository", + :profile => @page.profile.identifier, + :action => "new", + :id => @page.id %>
      -
      - -
      -
      -
      -
      -
      <% end %> diff --git a/plugins/mezuro/views/content_viewer/show_reading_group.rhtml b/plugins/mezuro/views/content_viewer/show_reading_group.rhtml new file mode 100644 index 0000000..6743e55 --- /dev/null +++ b/plugins/mezuro/views/content_viewer/show_reading_group.rhtml @@ -0,0 +1,49 @@ +<% @reading_group = @page.reading_group %> + +<% unless @page.errors[:base].nil? %> + <% if @page.errors[:base] == "Kalibro::Errors::RecordNotFound" %> +

      Warning:

      +

      This reading group doesn't exist on the Web Service. Do you want to <%= link_to 'delete', :action => 'destroy', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %> or <%= link_to 'save it again', :action => 'edit', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %>?

      + <% else %> + <%= @page.errors[:base] %> + <% end %> +<% else %> + + + + + + + + + + +
      <%= _('Name') %><%= @reading_group.name %>
      <%= _('Description') %><%= @reading_group.description %>
      +
      +
      <%= _('Readings') %>
      + + <% @page.readings.each do |reading| %> + + + + + + + <% end %> +
      <%= link_to reading.label, :controller => "mezuro_plugin_reading", + :profile => @page.profile.identifier, + :action => "edit", + :id => @page.id, + :reading_id => reading.id %><%= reading.grade %><%= link_to _('Remove'), {:controller => "mezuro_plugin_reading", + :profile => @page.profile.identifier, + :action => "destroy", + :id => @page.id, + :reading_id => reading.id}, :class=>"button with-text icon-delete" %>
      + +
      + <%= link_to "#{image_tag('/plugins/mezuro/images/plus.png')}Add Reading", :controller => "mezuro_plugin_reading", + :profile => @page.profile.identifier, + :action => "new", + :id => @page.id %>
      + +<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb new file mode 100644 index 0000000..8c184fe --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb @@ -0,0 +1,19 @@ +<%= hidden_field_tag :id, @configuration_content.id %> +<%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %> + +<% f.fields_for :metric do |m| %> + <%= m.hidden_field :compound, :value => "true" %> + <%= required labelled_form_field _('Metric Name:'), m.text_field(:name, :value => @metric_configuration.metric.name) %> + <%= labelled_form_field _('Description:'), m.text_field(:description, :value => @metric_configuration.metric.description) %> + <%= required labelled_form_field _('Script:'), m.text_area(:script, :rows => 5, :value => @metric_configuration.metric.script) %> + <%= required labelled_form_field _('Scope:'), + m.select(:scope, MezuroPlugin::Helpers::ContentViewerHelper.scope_options, :selected => @metric_configuration.metric.scope) %> +<% end %> + +<%= required labelled_form_field _('Code:'), f.text_field(:code) %> +<%= required labelled_form_field _('Aggregation Form:'), + f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %> +<%= required labelled_form_field _('Weight:'), f.text_field(:weight) %> +<%= required labelled_form_field _('Reading Group:'), f.select(:reading_group_id, @reading_group_names_and_ids) %> + +

      <%= f.submit "Save" %>

      diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb new file mode 100644 index 0000000..089af13 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb @@ -0,0 +1,2 @@ +

      An error occured:

      +<%= @message %> diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb new file mode 100644 index 0000000..630b914 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb @@ -0,0 +1,12 @@ + + + + + + <% metric_configurations.each do |metric_configuration| %> + + + + + <% end %> +
      Metric Name
      Metric Code
      <%= metric_configuration.metric.name %><%= metric_configuration.code %>
      diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml new file mode 100644 index 0000000..b54bd42 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml @@ -0,0 +1,26 @@ +<%= hidden_field_tag :id, @configuration_content.id %> +<%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %> + +<%= labelled_form_field _('Collector Name:'), f.text_field(:base_tool_name, :readonly => true) %> + +<% f.fields_for :metric do |m| %> + <%= m.hidden_field :compound, :value => "false" %> + <% @metric_configuration.metric.language.each do |language| %> + <%= m.hidden_field :language, :multiple => true, :value => language %> + <% end %> + <%= m.hidden_field "scope", :value => @metric.scope %> + <%= required labelled_form_field _('Metric Name:'), m.text_field(:name, :readonly => true, :value => @metric.name) %> + <%= labelled_form_field _('Description:'), m.text_field(:description, :readonly => true, :value => @metric.description) %> +<% end %> + +<%= required labelled_form_field _('Code:'), f.text_field(:code) %> + +<%= required labelled_form_field _('Aggregation Form:'), +f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %> + +<%= required labelled_form_field _('Weight:'), f.text_field(:weight) %> + +<%= required labelled_form_field _('Reading Group:'), +f.select(:reading_group_id, @reading_group_names_and_ids) %> + +

      <%= f.submit "Save" %>

      diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml new file mode 100644 index 0000000..5a8fcd0 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml @@ -0,0 +1,15 @@ +

      + Collector Name: <%= @metric_configuration.base_tool_name %> +

      +

      + Metric Name: <%= @metric.name %> +

      +

      + Code: <%= @metric_configuration.code %> +

      +

      + Aggregation Form: <%= @metric_configuration.aggregation_form %> +

      +

      + Weight: <%= @metric_configuration.weight %> +

      diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb new file mode 100644 index 0000000..2075e60 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb @@ -0,0 +1,18 @@ +

      <%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %>

      + +<%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound", + :id => @configuration_content.id %> + +
      Base Tools:
      +<% @base_tools.each do |base_tool| %> +

      <%= link_to base_tool.name, "#", :onclick => "jQuery(\"\##{base_tool.name}\").toggle();"%>

      +
      + + +<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb new file mode 100644 index 0000000..ad77d25 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb @@ -0,0 +1,16 @@ + + + + +

      <%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %>

      + +<% owner = (not user.nil?) && user.id == @profile.id %> + +<% form_for :metric_configuration, :url => {:action =>"update", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %> + <%= f.hidden_field :id %> + <%= render :partial => "compound_metric_configuration_form", :locals => {:f => f} %> +<% end %> + +<%= render :partial => "mezuro_plugin_range/ranges", :locals => {:owner => owner} %> +
      +<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %> diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb new file mode 100644 index 0000000..3df61dd --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb @@ -0,0 +1,18 @@ + + + + +

      <%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %>

      + +<% owner = (not user.nil?) && user.id == @profile.id %> + +<% if owner %> + <% form_for :metric_configuration, :url => {:action =>"update", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %> + <%= f.hidden_field :id %> + <%= render :partial => "native_metric_configuration_form", :locals => {:f => f} %> + <% end %> +<% else %> + <%= render :partial => "native_metric_configuration_view" %> +<% end %> + +<%= render :partial => "mezuro_plugin_range/ranges", :locals => {:owner => owner} %> diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb new file mode 100644 index 0000000..5a749a3 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb @@ -0,0 +1,7 @@ +

      <%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %>

      + +<% form_for :metric_configuration, :url => {:action =>"create", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %> + <%= render :partial => "compound_metric_configuration_form", :locals => {:f => f} %> +<% end %> + +<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %> diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb new file mode 100644 index 0000000..8b74013 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb @@ -0,0 +1,7 @@ + + +

      <%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %>

      + +<% form_for :metric_configuration, :url => {:action =>"create", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %> + <%= render :partial => "native_metric_configuration_form", :locals => {:f => f} %> +<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_module_result/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_module_result/_error_page.html.erb new file mode 100644 index 0000000..089af13 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_module_result/_error_page.html.erb @@ -0,0 +1,2 @@ +

      An error occured:

      +<%= @message %> diff --git a/plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml b/plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml new file mode 100644 index 0000000..603769c --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml @@ -0,0 +1,41 @@ + + + Metric + Value + Weight + Threshold + + + + <% @metric_results.each do |metric_result| %> + <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%> + <% range_snapshots = metric_configuration_snapshot.range_snapshot %> + <% metric_name = metric_configuration_snapshot.metric.name %> + <% formatted_name = metric_name.delete("() ") %> + <% if !range_snapshots.nil? %> + + <%= metric_name %> + <%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %> + <%= metric_configuration_snapshot.weight %> + <% range_snapshots.each do |range_snapshot| %> + <% if range_snapshot.beginning <= metric_result.value and range_snapshot.end > metric_result.value %> + + + <%= range_snapshot.label %> + + + + + +
      +
      + + + <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %> + + + <% end %> + <% end %> + <% end %> + <% end %> + diff --git a/plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml b/plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml new file mode 100644 index 0000000..f0bf1ce --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml @@ -0,0 +1,24 @@ +<%= render :partial => "source_tree", :locals => {:module_result => @module_result} %> +
      <%= _"Metric results for: #{MezuroPlugin::Helpers::ModuleResultHelper.module_name(@module_result.module.name)} (#{@module_result.module.granularity})" %>
      + +
      +
      + + <%= render :partial => "metric_results", :locals => {:metric_results => @metric_results, :module_result_id => @module_result.id} %> + + + + + + +
      + + + + + <%= _('Grade:') %> + <%= "%.02f" % @module_result.grade %> + + +
      +
      diff --git a/plugins/mezuro/views/mezuro_plugin_module_result/_score_history.rhtml b/plugins/mezuro/views/mezuro_plugin_module_result/_score_history.rhtml new file mode 100644 index 0000000..b30fc6a --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_module_result/_score_history.rhtml @@ -0,0 +1 @@ +<%= image_tag(MezuroPlugin::Helpers::ContentViewerHelper.generate_chart(@history)) %> diff --git a/plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml b/plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml new file mode 100644 index 0000000..ae5c448 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml @@ -0,0 +1,34 @@ +

      <%= _('Source tree') %>

      +<% helper = MezuroPlugin::Helpers::ModuleResultHelper %> +<% module_name = helper.module_name(module_result.module.name) %> +<% module_label = "#{module_name} (#{module_result.module.granularity})" %> + +

      +

      + <% module_result.parents.each do |parent| %> + / + <%= helper.module_name parent.module.name %> + + <% end %>/ <%= helper.module_name module_name %> +

      +

      + + + <% module_result.children.each do |child| %> + <% if child.module.granularity=='PACKAGE' %> + + + + + <% else %> + + + + + <% end %> + <% end %> +
      <%= image_tag('/plugins/mezuro/images/folder.png')%><%= helper.module_name child.module.name %>
      <%= image_tag('/plugins/mezuro/images/file.png') %> + + <%= helper.module_name child.module.name %> + +
      diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb deleted file mode 100644 index 6dc8cc9..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %> - <%= hidden_field_tag :beginning_id, beginning_id %> - <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id, :beginning_id => beginning_id, :range => range } %> -<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb new file mode 100644 index 0000000..089af13 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb @@ -0,0 +1,2 @@ +

      An error occured:

      +<%= @message %> diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb deleted file mode 100644 index 630b914..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - <% metric_configurations.each do |metric_configuration| %> - - - - - <% end %> -
      Metric Name
      Metric Code
      <%= metric_configuration.metric.name %><%= metric_configuration.code %>
      diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb deleted file mode 100644 index 62def0e..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %> - <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id } %> -<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb deleted file mode 100644 index 27fd6f1..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb +++ /dev/null @@ -1,17 +0,0 @@ - - - <%=range.label%> - - - <%=range.beginning%> - - - <%=range.end%> - - - <%=range.grade%> - - - <%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_myprofile", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning} %> - <%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_myprofile", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning %> - diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb deleted file mode 100644 index 3ab3a72..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb +++ /dev/null @@ -1,61 +0,0 @@ -<%= hidden_field_tag :id, id %> -<%= hidden_field_tag :metric_name, metric_name %> - - - - - - - - - - - - - - - - - - - - - - - - - -
      - <%= f.label :label, "(*) Label:" %> - - <%= f.text_field :label %> -
      - <%= f.label :beginning, "(*) Beginning:" %> - - <%= f.text_field :beginning, :value => @range.beginning %> -
      - <%= f.label :end, "(*) End:" %> - - <%= f.text_field :end, :value => @range.end %> -
      - <%= f.label :grade, "(*) Grade:" %> - - <%= f.text_field :grade %> -
      - <%= f.label :color, "(*) Color:" %> - - <%= f.text_field(:color, :id => "range_color", :value => @range.mezuro_color) %> -
      - <%= f.label :comments, "Comments:" %> - - <%= f.text_field :comments %> -
      -<%= f.submit "Save Range" %> - - diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb deleted file mode 100644 index 4fb7134..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -

      <%= @configuration_content.name%> Configuration

      - -<%= link_to "New Compound Metric", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params => -{ :id => @configuration_content.id } %> - -
      Base Tools:
      - - <% @base_tools.each do |base_tool| %> - - - - <% end %> -
      - <%= link_to base_tool, :controller => "mezuro_plugin_myprofile", :action => "choose_metric", :params => - { :base_tool => base_tool, :id => @configuration_content.id} %> -
      diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb deleted file mode 100644 index 06c1a62..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -

      <%= @configuration_content.name %> Configuration

      - - - -
      Metric Collector: <%= @base_tool %>
      - - -
      Choose a metric to add:
      - - <% @supported_metrics.each do |metric| %> - - - - <% end %> -
      - <%= link_to metric.name, :controller => "mezuro_plugin_myprofile", :action => "new_metric_configuration", :params => {:metric_name => metric.name, - :base_tool => @base_tool, :id => @configuration_content.id } %> -
      diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/create_range.rjs b/plugins/mezuro/views/mezuro_plugin_myprofile/create_range.rjs deleted file mode 100644 index f0cf9ee..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/create_range.rjs +++ /dev/null @@ -1,2 +0,0 @@ -page.visual_effect :toggle_slide, "range_form" -page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range} diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb deleted file mode 100644 index 0bbd114..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb +++ /dev/null @@ -1,81 +0,0 @@ - - - - -

      <%= @configuration_content.name %> Configuration

      - -<% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %> - <%= hidden_field_tag :id, @configuration_content.id %> - <%= f.hidden_field :configuration_name, :value => @configuration_content.name %> - -

      - <%= "Metric Name:" + @metric.name %> -

      - <% f.fields_for :metric do |m| %> - <%= m.hidden_field :name, :value => @metric.name %> -

      - <%= m.label :description, "Description:" %> - <%= m.text_field "description", :value => @metric.description %> -

      -

      - <%= m.label :scope, "Scope:" %> - <%= m.select :scope, [["Class", "CLASS"]], :selected => @metric.scope %> -

      -

      - <%= m.label :script, "Script:" %> - <%= m.text_area "script", :value => @metric.script %> -

      - <% end %> -

      - <%= f.label :code, "Code:" %> - <%= f.text_field "code" %> -

      -

      - <%= f.label :aggregation_form, "Aggregation Form:" %> - <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], - ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %> -

      -

      - <%= f.label :weight, "Weight:" %> - <%= f.text_field :weight %> -

      -

      - <%= f.submit "Save" %> -

      -<% end %> - - -
      Ranges

      - - - - - - - - - - <% if (@metric_configuration.ranges!=nil) - @metric_configuration.ranges.each do |range| %> - <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, - :metric_name => @metric_configuration.metric.name} %> - <% end - end %> -
      - Label - - Beginning - - End - - Grade - - Color -
      - -
      -<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :id => @configuration_content.id, :metric_name => @metric.name} %> - - -
      -<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %> diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb deleted file mode 100644 index 3bb1ea8..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb +++ /dev/null @@ -1,89 +0,0 @@ - - - - -

      <%= @configuration_content.name %> Configuration

      - -<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %> - <%= hidden_field_tag :id, @configuration_content.id %> - <%= f.hidden_field :configuration_name, :value => @configuration_content.name %> - - <% f.fields_for :metric do |m| %> - - <% @metric.language.each do |language| %> - <%= m.hidden_field :language, :multiple => true, :value => language %> - <% end %> - - <%= m.hidden_field "scope", :value => @metric.scope %> -

      - <%= m.label :origin, "Collector Name:" %> - <%= @metric.origin %> - <%= m.hidden_field "origin", :value => @metric.origin %> -

      -

      - <%= m.label :metric_name, "Metric Name:" %> - <%= @metric.name %> - <%= m.hidden_field "name", :value => @metric.name %> -

      - - <% m.label :description, "Description:" %> - <% @metric.description %> - <% m.hidden_field "description", :value => @metric.description %> - - <% end %> -

      - <%= f.label :code, "Code:" %> - <%= @metric_configuration.code %> - <%= f.hidden_field "code", :value => @metric_configuration.code %> -

      -

      - <%= f.label :aggregation_form, "Aggregation Form:" %> - <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], - ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %> -

      -

      - <%= f.label :weight, "Weight:" %> - <%= f.text_field "weight", :value => @metric_configuration.weight %> -

      - -

      - <%= f.submit "Save" %> -

      -<% end %> - - -
      Ranges

      - - - - - - - - - - - - <% if (@metric_configuration.ranges!=nil) - @metric_configuration.ranges.each do |range| %> - <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, - :metric_name => @metric.name} %> - <% end - end %> -
      - Label - - Beginning - - End - - Grade - - Color -
      - -
      -<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_myprofile", :id => @configuration_content.id, :metric_name => @metric.name} %> - - - diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs deleted file mode 100644 index 2358788..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs +++ /dev/null @@ -1,2 +0,0 @@ -page.replace_html 'range_form', :partial => "edit_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id, :beginning_id => @beginning_id, :range => @range } -page.visual_effect :slide_down, "range_form" diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb deleted file mode 100644 index 754cb4f..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb +++ /dev/null @@ -1,44 +0,0 @@ -

      <%= @configuration_content.name %> Configuration

      - -<% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", -:controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %> - <%= hidden_field_tag :id, @configuration_content.id %> - <%= f.hidden_field :configuration_name, :value => @configuration_content.name %> - - <% f.fields_for :metric do |m| %> -

      - <%= m.label :name, "Name:" %> - <%= m.text_field "name" %> -

      -

      - <%= m.label :description, "Description:" %> - <%= m.text_field "description" %> -

      -

      - <%= m.label :scope, "Scope:" %> - <%= m.select :scope, [["Class", "CLASS"]] %> -

      -

      - <%= m.label :script, "Script:" %> - <%= m.text_area "script" %> -

      - <% end %> -

      - <%= f.label :code, "Code:" %> - <%= f.text_field "code" %> -

      -

      - <%= f.label :aggregation_form, "Aggregation Form:" %> - <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], - ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %> -

      -

      - <%= f.label :weight, "Weight:" %> - <%= f.text_field :weight %> -

      -

      - <%= f.submit "Add" %> -

      -<% end %> - -<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %> diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb deleted file mode 100644 index 818a2d8..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb +++ /dev/null @@ -1,51 +0,0 @@ - - -

      <%= @configuration_content.name %> Configuration

      - -<% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %> - <%= hidden_field_tag :id, @configuration_content.id %> - <%= f.hidden_field :configuration_name, :value => @configuration_content.name %> - - <% f.fields_for :metric do |m| %> - - <% @metric.language.each do |language| %> - <%= m.hidden_field :language, :multiple => true, :value => language %> - <% end %> - - <%= m.hidden_field "scope", :value => @metric.scope %> -

      - <%= m.label :origin, "Collector Name:" %> - <%= @metric.origin %> - <%= m.hidden_field "origin", :value => @metric.origin %> -

      -

      - <%= m.label :name, "Metric Name:" %> - <%= @metric.name %> - <%= m.hidden_field "name", :value => @metric.name %> -

      - - <% m.label :description, "Description:" %> - <% @metric.description %> - <% m.hidden_field "description", :value => @metric.description %> - - <% end %> -

      - <%= f.label :code, "Code:" %> - <%= f.text_field :code %> -

      -

      - <%= f.label :aggregation_form, "Aggregation Form:" %> - <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], - ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %> -

      -

      - <%= f.label :weight, "Weight:" %> - <%= f.text_field :weight %> -

      - -

      - <%= f.submit "Add" %> -

      - -<% end %> - diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs b/plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs deleted file mode 100644 index fa13dee..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs +++ /dev/null @@ -1,2 +0,0 @@ -page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id } -page.visual_effect :slide_down, "range_form" diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/update_range.rjs b/plugins/mezuro/views/mezuro_plugin_myprofile/update_range.rjs deleted file mode 100644 index 5b95d3b..0000000 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/update_range.rjs +++ /dev/null @@ -1 +0,0 @@ -page.reload() diff --git a/plugins/mezuro/views/mezuro_plugin_processing/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_processing/_error_page.html.erb new file mode 100644 index 0000000..55bdf75 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_processing/_error_page.html.erb @@ -0,0 +1,2 @@ +

      An error occured:

      +<%= @processing.error.message %> diff --git a/plugins/mezuro/views/mezuro_plugin_processing/_processing.rhtml b/plugins/mezuro/views/mezuro_plugin_processing/_processing.rhtml new file mode 100644 index 0000000..f5cc6bd --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_processing/_processing.rhtml @@ -0,0 +1,36 @@ +
      + +

      <%= _('Last Result') %>

      + + + + + + + <% @processing.process_time.each do |process_time| %> + + + + + <% end %> + + + + +
      <%= _('Date') %><%= @processing.date.inspect %>
      <%= _(process_time.state + ' time') %><%= MezuroPlugin::Helpers::ContentViewerHelper.format_time(process_time.time) %>
      Click to choose specific date:<%= link_to(image_tag('/images/calendar_date_select/calendar.png', :width => 20, :height => 20, :onClick => "$( 'datepicker' ).toggle();"), "javascript:void(0)") %>
      + +
      + + + + diff --git a/plugins/mezuro/views/mezuro_plugin_processing/_processing_error.rhtml b/plugins/mezuro/views/mezuro_plugin_processing/_processing_error.rhtml new file mode 100644 index 0000000..1a4eaca --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_processing/_processing_error.rhtml @@ -0,0 +1,12 @@ +

      <%= _('ERROR') %>

      +

      + <%= "State when error ocurred: #{@processing.state}" %> +
      + <% error = @processing.error %> + <%= error.message %> +

        + <% error.stack_trace.each do |trace| %> +
      • <%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %>
        • + <% end %> +
      +

      diff --git a/plugins/mezuro/views/mezuro_plugin_profile/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/_error_page.html.erb new file mode 100644 index 0000000..089af13 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_profile/_error_page.html.erb @@ -0,0 +1,2 @@ +

      An error occured:

      +<%= @message %> diff --git a/plugins/mezuro/views/mezuro_plugin_profile/error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_profile/error_page.html.erb deleted file mode 100644 index 089af13..0000000 --- a/plugins/mezuro/views/mezuro_plugin_profile/error_page.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

      An error occured:

      -<%= @message %> diff --git a/plugins/mezuro/views/mezuro_plugin_range/_edit.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_edit.html.erb new file mode 100644 index 0000000..8b02ace --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/_edit.html.erb @@ -0,0 +1,4 @@ +<% remote_form_for :range, :url => {:action =>"update", :controller => "mezuro_plugin_range"}, :method => :get do |f| %> + <%= hidden_field_tag :beginning_id, @beginning_id %> + <%= render :partial => "form", :locals => {:f => f} %> +<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb new file mode 100644 index 0000000..089af13 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb @@ -0,0 +1,2 @@ +

      An error occured:

      +<%= @message %> diff --git a/plugins/mezuro/views/mezuro_plugin_range/_form.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_form.html.erb new file mode 100644 index 0000000..142fdc3 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/_form.html.erb @@ -0,0 +1,37 @@ +<%= hidden_field_tag :id, @content_id %> +<%= hidden_field_tag :metric_configuration_id, @metric_configuration_id %> +<%= hidden_field_tag :reading_group_id, @reading_group_id %> +<%= hidden_field_tag :compound, @compound %> + +<%= f.hidden_field :id %> + + <%= required labelled_form_field _('Label'), + f.select(:reading_id, @reading_labels_and_ids) %>
      + + + + + + + + + + + + + +
      + <%= f.label :beginning, "(*) Beginning:" %> + + <%= required f.text_field :beginning, :id => "range_beginning" %> <%= link_to('-∞', 'javascript:void(0)', :onClick => "jQuery( '#range_beginning' ).val('-INF');") %> +
      + <%= f.label :end, "(*) End:" %> + + <%= required f.text_field(:end, :id => "range_end") %> <%= link_to('+∞', 'javascript:void(0)', :onClick => "jQuery( '#range_end' ).val('+INF');") %> +
      + <%= f.label :comments, "(*) Comments:" %> + + <%= required f.text_area :comments, :rows => 3 %> +
      +
      +<%= f.submit "Save Range" %> diff --git a/plugins/mezuro/views/mezuro_plugin_range/_new.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_new.html.erb new file mode 100644 index 0000000..1ae8d95 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/_new.html.erb @@ -0,0 +1,3 @@ +<% remote_form_for :range, :url => {:action =>"create", :controller => "mezuro_plugin_range"}, :method => :get do |f| %> + <%= render :partial => "form", :locals => {:f => f} %> +<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb new file mode 100644 index 0000000..8994aec --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb @@ -0,0 +1,24 @@ + + + <%=range.label%> + + + <%=range.beginning%> + + + <%=range.end%> + + + <%=range.grade%> + + + <% if (not user.nil?) && user.id == @profile.id %> + <%= link_to_remote "Edit", :url => {:action =>"edit", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :reading_group_id => reading_group_id} %> + + <%= link_to "Remove", :action =>"remove", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :compound => compound %> + + <% else %> + + + <% end %> + diff --git a/plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb new file mode 100644 index 0000000..5589184 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb @@ -0,0 +1,31 @@ +
      Ranges

      + + + + + + + + + + <% @ranges.each do |range| %> + <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, + :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %> + <% end %> +
      + Label + + Beginning + + End + + Grade + + Color +
      + +
      +<% if owner %> + <%= link_to_remote "New Range", :url => {:action =>"new", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %> +<% end %> + diff --git a/plugins/mezuro/views/mezuro_plugin_range/create.rjs b/plugins/mezuro/views/mezuro_plugin_range/create.rjs new file mode 100644 index 0000000..a4c68cf --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/create.rjs @@ -0,0 +1,6 @@ +if @error.nil? + page.visual_effect :toggle_slide, "form" + page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range, :reading_group_id => @reading_group_id, :compound => @compound} +else + page.alert @error +end diff --git a/plugins/mezuro/views/mezuro_plugin_range/edit.rjs b/plugins/mezuro/views/mezuro_plugin_range/edit.rjs new file mode 100644 index 0000000..db71861 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/edit.rjs @@ -0,0 +1,3 @@ +page.replace_html 'form', :partial => "edit", :locals => {:range => @range} +page.visual_effect :slide_down, "form" + diff --git a/plugins/mezuro/views/mezuro_plugin_range/new.rjs b/plugins/mezuro/views/mezuro_plugin_range/new.rjs new file mode 100644 index 0000000..43bf549 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/new.rjs @@ -0,0 +1,3 @@ +page.replace_html 'form', :partial => "new" +page.visual_effect :slide_down, "form" + diff --git a/plugins/mezuro/views/mezuro_plugin_range/update.rjs b/plugins/mezuro/views/mezuro_plugin_range/update.rjs new file mode 100644 index 0000000..3000105 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_range/update.rjs @@ -0,0 +1,5 @@ +if @error.nil? + page.reload() +else + page.alert @error +end diff --git a/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb new file mode 100644 index 0000000..9840b0b --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb @@ -0,0 +1,13 @@ +<%= hidden_field_tag :id, @reading_group_content.id %> +<%= f.hidden_field(:group_id, :value => @reading_group_content.reading_group_id) %> + +<%= required labelled_form_field _('Label:'), f.text_field(:label) %> + +<%= required labelled_form_field _('Grade:'), f.text_field(:grade) %> + +<%= required labelled_form_field _('Color:'), +colorpicker_field(:reading, :color) %>Click in the field to change Color + +
      + +

      <%= f.submit "Save" %>

      diff --git a/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb new file mode 100644 index 0000000..7c6dea1 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb @@ -0,0 +1,10 @@ + + + + +

      <%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %>

      + +<% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %> + <%= f.hidden_field :id %> + <%= render :partial => "form", :locals => {:f => f} %> +<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb new file mode 100644 index 0000000..83d6d22 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb @@ -0,0 +1,9 @@ + + + + +

      <%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %>

      + +<% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %> + <%= render :partial => "form", :locals => {:f => f} %> +<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_repository/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/_error_page.html.erb new file mode 100644 index 0000000..089af13 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_repository/_error_page.html.erb @@ -0,0 +1,2 @@ +

      An error occured:

      +<%= @message %> diff --git a/plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb new file mode 100644 index 0000000..abb66f0 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb @@ -0,0 +1,23 @@ +<%= hidden_field_tag :id, @project_content.id %> +<%= f.hidden_field(:project_id, :value => @project_content.project_id) %> + +<%= required labelled_form_field _('Name'), f.text_field(:name) %> + +<%= labelled_form_field _("Description"), f.text_field(:description) %> + +<%= required labelled_form_field _('License'), +f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %> + +<%= required labelled_form_field _('Process Period'), +f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options) %> + +<%= required labelled_form_field _('Type'), +f.select(:type, @repository_types) %> + +<%= required labelled_form_field _('Address'), +f.text_field(:address) %> + +<%= required labelled_form_field _('Configuration'), +f.select(:configuration_id, @configuration_select) %> + +

      <%= f.submit "Add" %>

      diff --git a/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb new file mode 100644 index 0000000..0b483e6 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb @@ -0,0 +1,7 @@ + + +

      <%= link_to("#{@project_content.name} Project", @project_content.view_url) %>

      +<% form_for :repository, :url => {:action =>"save", :controller => "mezuro_plugin_repository"}, :method => :get do |f| %> + <%= f.hidden_field :id %> + <%= render :partial => "form", :locals => {:f => f} %> +<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb new file mode 100644 index 0000000..0bc4b07 --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb @@ -0,0 +1,6 @@ + + +

      <%= link_to("#{@project_content.name} Project", @project_content.view_url) %>

      +<% form_for :repository, :url => {:action =>"save", :controller => "mezuro_plugin_repository"}, :method => :get do |f| %> + <%= render :partial => "form", :locals => {:f => f} %> +<% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_repository/show.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/show.html.erb new file mode 100644 index 0000000..8d8a72c --- /dev/null +++ b/plugins/mezuro/views/mezuro_plugin_repository/show.html.erb @@ -0,0 +1,45 @@ + +

      <%= link_to("#{@project_content.name} Project", @project_content.view_url) %>

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      <%= _('Name') %><%= @repository.name %>
      <%= _('Description') %><%= @repository.description %>
      <%= _('License') %><%= @repository.license %>
      <%= _('Process Period') %><%= MezuroPlugin::Helpers::ContentViewerHelper.periodicity_option(@repository.process_period.to_i) %>
      <%= _('Type') %><%= @repository.type %>
      <%= _('Address') %><%= @repository.address %>
      <%= _('Configuration') %><%= @configuration_name %>
      <%= _('Status')%> +
      Retrieving
      +
      +
      +
      + +
      +
      diff --git a/plugins/require_auth_to_comment/public/hide_comment_form.js b/plugins/require_auth_to_comment/public/hide_comment_form.js index 018bbd5..29ac0e2 100644 --- a/plugins/require_auth_to_comment/public/hide_comment_form.js +++ b/plugins/require_auth_to_comment/public/hide_comment_form.js @@ -1,6 +1,6 @@ (function($) { $(window).bind('userDataLoaded', function(event, data) { - if (data.login || $('meta[name=profile.allow_unauthenticated_comments]').length > 0) { + if (data.login || $('meta[name="profile.allow_unauthenticated_comments"]').length > 0) { $('.post-comment-button').show(); $('#page-comment-form').show(); $('.comment-footer').show(); diff --git a/plugins/send_email/features/send_email_plugin.feature b/plugins/send_email/features/send_email_plugin.feature new file mode 100644 index 0000000..36b97a9 --- /dev/null +++ b/plugins/send_email/features/send_email_plugin.feature @@ -0,0 +1,41 @@ +Feature: send_email_plugin + + Background: + Given the following users + | login | name | + | joaosilva | Joao Silva | + And I am logged in as "joaosilva" + + Scenario: expand macro in article content + Given plugin SendEmailPlugin is enabled on environment + And the following articles + | owner | name | body | + | joaosilva | sample-article | URL path to {sendemail} action | + When I go to /joaosilva/sample-article + Then I should see "URL path to /profile/joaosilva/plugins/send_email/deliver action" + + Scenario: expand macro in block content + Given plugin SendEmailPlugin is enabled on environment + And the following blocks + | owner | type | html | + | joaosilva | RawHTMLBlock | URL path to {sendemail} action | + When I go to Joao Silva's homepage + Then I should see "URL path to /profile/joaosilva/plugins/send_email/deliver action" + + Scenario: as admin I can configure plugin + Given I am logged in as admin + When I go to the environment control panel + And I follow "Enable/disable plugins" + Then I should see "SendEmailPlugin" linking to "/admin/plugin/send_email" + + Scenario: configure plugin to allow emails to john@example.com + Given I am logged in as admin + And I go to the environment control panel + And I follow "Enable/disable plugins" + When I follow "SendEmailPlugin" + Then I should not see "john@example.com" + When I fill in "E-Mail addresses you want to allow to send" with "john@example.com" + And I press "Save" + Then I should be on /admin/plugins + When I follow "SendEmailPlugin" + Then I should see "john@example.com" diff --git a/plugins/send_email/test/features/send_email_plugin.feature b/plugins/send_email/test/features/send_email_plugin.feature deleted file mode 100644 index 36b97a9..0000000 --- a/plugins/send_email/test/features/send_email_plugin.feature +++ /dev/null @@ -1,41 +0,0 @@ -Feature: send_email_plugin - - Background: - Given the following users - | login | name | - | joaosilva | Joao Silva | - And I am logged in as "joaosilva" - - Scenario: expand macro in article content - Given plugin SendEmailPlugin is enabled on environment - And the following articles - | owner | name | body | - | joaosilva | sample-article | URL path to {sendemail} action | - When I go to /joaosilva/sample-article - Then I should see "URL path to /profile/joaosilva/plugins/send_email/deliver action" - - Scenario: expand macro in block content - Given plugin SendEmailPlugin is enabled on environment - And the following blocks - | owner | type | html | - | joaosilva | RawHTMLBlock | URL path to {sendemail} action | - When I go to Joao Silva's homepage - Then I should see "URL path to /profile/joaosilva/plugins/send_email/deliver action" - - Scenario: as admin I can configure plugin - Given I am logged in as admin - When I go to the environment control panel - And I follow "Enable/disable plugins" - Then I should see "SendEmailPlugin" linking to "/admin/plugin/send_email" - - Scenario: configure plugin to allow emails to john@example.com - Given I am logged in as admin - And I go to the environment control panel - And I follow "Enable/disable plugins" - When I follow "SendEmailPlugin" - Then I should not see "john@example.com" - When I fill in "E-Mail addresses you want to allow to send" with "john@example.com" - And I press "Save" - Then I should be on /admin/plugins - When I follow "SendEmailPlugin" - Then I should see "john@example.com" diff --git a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb index 28da890..8eb1747 100644 --- a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb +++ b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb @@ -13,9 +13,15 @@ class ShoppingCartPluginController < PublicController def get config = if cart.nil? - { 'enterprise_id' => nil, 'hasProducts' => false } + { :enterprise_id => nil, + :has_products => false, + :visible => false, + :products => []} else - { 'enterprise_id' => cart[:enterprise_id], 'hasProducts' => (cart[:items].keys.size > 0) } + { :enterprise_id => cart[:enterprise_id], + :has_products => (cart[:items].keys.size > 0), + :visible => visible?, + :products => products} end render :text => config.to_json end @@ -56,16 +62,6 @@ class ShoppingCartPluginController < PublicController def list if validate_cart_presence - products = self.cart[:items].collect do |id, quantity| - product = Product.find(id) - { :id => product.id, - :name => product.name, - :price => get_price(product, product.enterprise.environment), - :description => product.description, - :picture => product.default_image(:minor), - :quantity => quantity - } - end render :text => { :ok => true, :error => {:code => 0}, @@ -128,7 +124,7 @@ class ShoppingCartPluginController < PublicController end def visibility - render :text => self.cart.has_key?(:visibility) ? self.cart[:visibility].to_json : true.to_json + render :text => visible?.to_json end def show @@ -317,4 +313,31 @@ class ShoppingCartPluginController < PublicController :_noosfero_plugin_shopping_cart end + def visible? + !self.cart.has_key?(:visibility) || self.cart[:visibility] + end + + def products + self.cart[:items].collect do |id, quantity| + product = Product.find_by_id(id) + if product + { :id => product.id, + :name => product.name, + :price => get_price(product, product.enterprise.environment), + :description => product.description, + :picture => product.default_image(:minor), + :quantity => quantity + } + else + { :id => id, + :name => _('Undefined product'), + :price => 0, + :description => _('Wrong product id'), + :picture => '', + :quantity => quantity + } + end + end + end + end diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin.rb b/plugins/shopping_cart/lib/shopping_cart_plugin.rb index 1afb4f6..934cd67 100644 --- a/plugins/shopping_cart/lib/shopping_cart_plugin.rb +++ b/plugins/shopping_cart/lib/shopping_cart_plugin.rb @@ -12,10 +12,6 @@ class ShoppingCartPlugin < Noosfero::Plugin _("A shopping basket feature for enterprises") end - def enabled_default_setting - true - end - def delivery_default_setting false end diff --git a/plugins/shopping_cart/public/cart.js b/plugins/shopping_cart/public/cart.js index 58cc1ab..ed13327 100644 --- a/plugins/shopping_cart/public/cart.js +++ b/plugins/shopping_cart/public/cart.js @@ -6,50 +6,36 @@ function Cart(config) { this.contentBox = $("#cart1 .cart-content"); this.itemsBox = $("#cart1 .cart-items"); this.items = {}; - this.empty = !config.hasProducts; + this.empty = !config.has_products; this.visible = false; $(".cart-buy", this.cartElem).button({ icons: { primary: 'ui-icon-cart'} }); if (!this.empty) { $(this.cartElem).show(); - me = this; - $.ajax({ - url: '/plugin/shopping_cart/visibility', - dataType: 'json', - success: function(data, status, ajax){ - me.visible = /^true$/i.test(data); - me.listProducts(); - }, - cache: false, - error: function(ajax, status, errorThrown) { - alert('Visibility - HTTP '+status+': '+errorThrown); - } - }); - $(".cart-buy", this.cartElem).colorbox({ href: '/plugin/shopping_cart/buy' }); + this.visible = config.visible; + this.addToList(config.products, true) } } (function($){ - Cart.prototype.listProducts = function() { + // Forbidding the user to request more the one action on the cart + // simultaneously because the cart in the cookie doesn't supports it. + Cart.prototype.ajax = function(config){ var me = this; - $.ajax({ - url: '/plugin/shopping_cart/list', - dataType: 'json', - success: function(data, ststus, ajax){ - if ( !data.ok ) alert(data.error.message); - else me.addToList(data, true); - }, - cache: false, - error: function(ajax, status, errorThrown) { - alert('List cart items - HTTP '+status+': '+errorThrown); - } - }); + this.disabled = true; + var completeCallback = config.complete; + config.complete = function(){ + me.disabled = false; + if (completeCallback) completeCallback(); + }; + $.ajax(config); } - Cart.prototype.addToList = function(data, clear) { + Cart.prototype.addToList = function(products, clear) { if( clear ) this.itemsBox.empty(); var me = this; - for( var item,i=0; item=data.products[i]; i++ ) { + this.productsLength = products.length; + for( var item,i=0; item=products[i]; i++ ) { this.items[item.id] = { price:item.price, quantity:item.quantity }; this.updateTotal(); var liId = "cart-item-"+item.id; @@ -65,7 +51,7 @@ function Cart(config) { ).appendTo(li); var input = $("input", li)[0]; input.lastValue = input.value; - input.itemId = item.id; + input.productId = item.id; input.ajustSize = function() { var len = this.value.toString().length; if(len > 2) len--; @@ -73,11 +59,9 @@ function Cart(config) { }; input.ajustSize(); input.onchange = function() { - me.updateQuantity(this, this.itemId, this.value); + me.updateQuantity(this, this.productId, this.value); }; -// document.location.href = "#"+liId; -// document.location.href = "#"+this.cartElem.id; -// history.go(-2); + // TODO: Scroll to newest item var liBg = li.css("background-color"); li[0].style.backgroundColor = "#FF0"; li.animate({ backgroundColor: liBg }, 1000); @@ -86,24 +70,25 @@ function Cart(config) { if (!clear && this.empty) $(this.cartElem).show(); if((!clear && this.empty) || (this.visible && clear)) { this.contentBox.hide(); - this.show(); + this.show(!clear); } this.empty = false; } Cart.prototype.updateQuantity = function(input, itemId, quantity) { + if(this.disabled) return alert(shoppingCartPluginL10n.waitLastRequest); quantity = parseInt(quantity); input.disabled = true; var originalBg = input.style.backgroundImage; input.style.backgroundImage = "url(/images/loading-small.gif)"; var me = this; if( quantity == NaN ) return input.value = input.lastValue; - $.ajax({ + this.ajax({ url: '/plugin/shopping_cart/update_quantity/'+ itemId +'?quantity='+ quantity, dataType: 'json', success: function(data, status, ajax){ if ( !data.ok ) { - alert(data.error.message); + log.error(data.error); input.value = input.lastValue; } else { @@ -114,7 +99,7 @@ function Cart(config) { }, cache: false, error: function(ajax, status, errorThrown) { - alert('Add item - HTTP '+status+': '+errorThrown); + log.error('Add item - HTTP '+status, errorThrown); input.value = input.lastValue; }, complete: function(){ @@ -132,89 +117,103 @@ function Cart(config) { } Cart.addItem = function(itemId, link) { + if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest); + if ( this.productsLength > 100 ) { + // This limit protect the user from losing data on cookie limit. + // This is NOT limiting to 100 products, is limiting to 100 kinds of products. + alert(shoppingCartPluginL10n.maxNumberOfItens); + return false; + } link.intervalId = setInterval(function() { + $(link).addClass('loading'); steps = ['w', 'n', 'e', 's']; if( !link.step || link.step==3 ) link.step = 0; link.step++; - $(link).button({ icons: { primary: 'ui-icon-arrowrefresh-1-'+steps[link.step]}, disable: true }) + $(link).button({ icons: { primary: 'ui-icon-arrowrefresh-1-'+steps[link.step]}}) }, 100); var stopBtLoading = function() { clearInterval(link.intervalId); - $(link).button({ icons: { primary: 'ui-icon-cart'}, disable: false }); + $(link).removeClass('loading'); + $(link).button({ icons: { primary: 'ui-icon-cart'}}); }; this.instance.addItem(itemId, stopBtLoading); } Cart.prototype.addItem = function(itemId, callback) { var me = this; - $.ajax({ + this.ajax({ url: '/plugin/shopping_cart/add/'+ itemId, dataType: 'json', success: function(data, status, ajax){ - if ( !data.ok ) alert(data.error.message); - else me.addToList(data); + if ( !data.ok ) log.error('Shopping cart data failure', data.error); + else me.addToList(data.products); }, cache: false, error: function(ajax, status, errorThrown) { - alert('Add item - HTTP '+status+': '+errorThrown); + log.error('Add item - HTTP '+status, errorThrown); }, complete: callback }); } Cart.removeItem = function(itemId) { - var message = this.instance.cartElem.getAttribute('data-l10nRemoveItem'); - if( confirm(message) ) this.instance.removeItem(itemId); + if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest); + if( confirm(shoppingCartPluginL10n.removeItem) ) this.instance.removeItem(itemId); } Cart.prototype.removeItem = function(itemId) { if ($("li", this.itemsBox).size() < 2) return this.clean(); var me = this; - $.ajax({ + this.ajax({ url: '/plugin/shopping_cart/remove/'+ itemId, dataType: 'json', success: function(data, status, ajax){ - if ( !data.ok ) alert(data.error.message); + if ( !data.ok ) log.error(data.error); else me.removeFromList(data.product_id); }, cache: false, error: function(ajax, status, errorThrown) { - alert('Remove item - HTTP '+status+': '+errorThrown); + log.error('Remove item - HTTP '+status, errorThrown); } }); } Cart.toggle = function(link) { + if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest); link.parentNode.parentNode.cartObj.toggle(); } Cart.prototype.toggle = function() { - this.visible ? this.hide() : this.show(); + this.visible ? this.hide(true) : this.show(true); } - Cart.prototype.show = function() { - $.ajax({ - url: '/plugin/shopping_cart/show', - dataType: 'json', - cache: false, - error: function(ajax, status, errorThrown) { - alert('Show - HTTP '+status+': '+errorThrown); - } - }); + Cart.prototype.show = function(register) { + if(register) { + this.ajax({ + url: '/plugin/shopping_cart/show', + dataType: 'json', + cache: false, + error: function(ajax, status, errorThrown) { + log.error('Show - HTTP '+status, errorThrown); + } + }); + } this.visible = true; this.contentBox.slideDown(500); $(".cart-toggle .str-show", this.cartElem).hide(); $(".cart-toggle .str-hide", this.cartElem).show(); } - Cart.prototype.hide = function() { - $.ajax({ - url: '/plugin/shopping_cart/hide', - dataType: 'json', - cache: false, - error: function(ajax, status, errorThrown) { - alert('Hide - HTTP '+status+': '+errorThrown); - } - }); + Cart.prototype.hide = function(register) { + if(register) { + this.ajax({ + url: '/plugin/shopping_cart/hide', + dataType: 'json', + cache: false, + error: function(ajax, status, errorThrown) { + log.error('Hide - HTTP '+status, errorThrown); + } + }); + } this.visible = false; this.contentBox.slideUp(500); $(".cart-toggle .str-show", this.cartElem).show(); @@ -238,17 +237,17 @@ function Cart(config) { } Cart.clean = function(link) { - var message = this.instance.cartElem.getAttribute('data-l10nCleanCart'); - if( confirm(message) ) link.parentNode.parentNode.parentNode.cartObj.clean(); + if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest); + if( confirm(shoppingCartPluginL10n.cleanCart) ) link.parentNode.parentNode.parentNode.cartObj.clean(); } Cart.prototype.clean = function() { var me = this; - $.ajax({ + this.ajax({ url: '/plugin/shopping_cart/clean', dataType: 'json', success: function(data, status, ajax){ - if ( !data.ok ) alert(data.error.message); + if ( !data.ok ) log.error(data.error); else{ me.items = {}; $(me.cartElem).slideUp(500, function() { @@ -261,7 +260,7 @@ function Cart(config) { }, cache: false, error: function(ajax, status, errorThrown) { - alert('Remove item - HTTP '+status+': '+errorThrown); + log.error('Remove item - HTTP '+status, errorThrown); } }); } @@ -274,7 +273,7 @@ function Cart(config) { Cart.prototype.send_request = function(params) { var me = this; - $.ajax({ + this.ajax({ type: 'POST', url: '/plugin/shopping_cart/send_request', data: params, @@ -288,7 +287,7 @@ function Cart(config) { }, cache: false, error: function(ajax, status, errorThrown) { - alert('Send request - HTTP '+status+': '+errorThrown); + log.error('Send request - HTTP '+status, errorThrown); }, complete: function() { $.colorbox.close(); @@ -300,6 +299,11 @@ function Cart(config) { $.colorbox.close(); } + $(window).bind('beforeunload', function(){ + log('Page unload.'); + Cart.unloadingPage = true; + }); + $(function(){ $.ajax({ @@ -311,7 +315,18 @@ function Cart(config) { }, cache: false, error: function(ajax, status, errorThrown) { - alert('Error getting shopping cart - HTTP '+status+': '+errorThrown); + // Give some time to register page unload. + setTimeout(function() { + // page unload is not our problem. + if (Cart.unloadingPage) { + log('Page unload before cart load.'); + } else { + log.error('Error getting shopping cart - HTTP '+status, errorThrown); + if ( confirm(shoppingCartPluginL10n.getProblemConfirmReload) ) { + document.location.reload(); + } + } + }, 100); } }); }); diff --git a/plugins/shopping_cart/public/style.css b/plugins/shopping_cart/public/style.css index 3fab249..dc5fb9e 100644 --- a/plugins/shopping_cart/public/style.css +++ b/plugins/shopping_cart/public/style.css @@ -209,7 +209,7 @@ label.error { padding-left: 5px; } -#order-filter { +#cart-order-filter { background-color: #ccc; border: 1px solid #aaa; border-radius: 5px; diff --git a/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb b/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb index 53c9929..8ada470 100644 --- a/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb +++ b/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb @@ -26,4 +26,10 @@ class ShoppingCartPluginTest < ActiveSupport::TestCase assert_nil shopping_cart.add_to_cart_button(product) end + + should 'be disabled by default on the enterprise' do + enterprise = fast_create(Enterprise) + settings = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin) + assert !settings.enabled + end end diff --git a/plugins/shopping_cart/views/cart.html.erb b/plugins/shopping_cart/views/cart.html.erb index dcd5ab6..a5e70c0 100644 --- a/plugins/shopping_cart/views/cart.html.erb +++ b/plugins/shopping_cart/views/cart.html.erb @@ -1,13 +1,11 @@ - <% if @settings.delivery %>
      <%=_('Delivery Address')%> diff --git a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb index a0a41aa..6eaba05 100644 --- a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb +++ b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb @@ -6,7 +6,7 @@ <% status_collection = [[nil, _('All')]] %> <% status_collection += status.map{|s| [pos+=1, s] } %> -<% form_tag({}, {:id => 'order-filter'}) do %> +<% form_tag({}, {:id => 'cart-order-filter'}) do %> <%= labelled_text_field(_('From')+' ', :from, @from.strftime("%Y-%m-%d"), :id => 'from', :size => 9) %> <%= labelled_text_field(_('to')+' ', :to, @to.strftime("%Y-%m-%d"), :id => 'to', :size => 9) %> <%= labelled_select(_('Status')+' ', :filter_status, :first, :last, @status, status_collection)%> diff --git a/plugins/spaminator/lib/spaminator_plugin/spaminator.rb b/plugins/spaminator/lib/spaminator_plugin/spaminator.rb index 253324e..14e34a3 100644 --- a/plugins/spaminator/lib/spaminator_plugin/spaminator.rb +++ b/plugins/spaminator/lib/spaminator_plugin/spaminator.rb @@ -12,12 +12,15 @@ class SpaminatorPlugin::Spaminator puts Benchmark.measure { run(environment) } end - def initialize_logger(logpath) + def initialize_logger(environment) + logdir = File.join(RAILS_ROOT, 'log', SpaminatorPlugin.name.underscore) + File.makedirs(logdir) if !File.exist?(logdir) + logpath = File.join(logdir, "#{environment.name.to_slug}_#{ENV['RAILS_ENV']}_#{Time.now.strftime('%F_%T')}.log") @logger = Logger.new(logpath) end def log(message) - @logger << "[#{Time.now.strftime("%F %T %z")}] #{message}\n" + @logger << "[#{Time.now.strftime('%F %T %z')}] #{message}\n" end end @@ -28,8 +31,7 @@ class SpaminatorPlugin::Spaminator @report = SpaminatorPlugin::Report.new(:environment => environment, :total_people => Person.count, :total_comments => Comment.count) - logpath = File.join(SpaminatorPlugin.root_path, 'log', "#{environment.name.to_slug}_#{ENV['RAILS_ENV']}_#{Time.now.strftime("%F_%T")}.log") - self.class.initialize_logger(logpath) + self.class.initialize_logger(environment) end def run diff --git a/po/de/noosfero.po b/po/de/noosfero.po index 7243ec8..427b1a2 100644 --- a/po/de/noosfero.po +++ b/po/de/noosfero.po @@ -6,8 +6,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.39.1\n" -"POT-Creation-Date: 2013-01-03 20:39-0000\n" +"Project-Id-Version: noosfero 0.39.3\n" +"POT-Creation-Date: 2013-01-19 21:42-0000\n" "PO-Revision-Date: 2012-03-27 19:47-0300\n" "Last-Translator: Josef Spillner \n" "Language-Team: German \n" @@ -25,35 +25,39 @@ msgstr "Ihre Einladung wurde versandt." msgid "Please enter a valid email address." msgstr "Bitte geben Sie eine gültige E-Mail-Adresse ein." -#: app/controllers/public/content_viewer_controller.rb:38 -msgid "" -"You are not allowed to view this content. You can contact the owner of this " -"profile to request access then." +#: app/controllers/public/content_viewer_controller.rb:35 +#, fuzzy +msgid "You are not allowed to view this content." +msgstr "Es ist Ihnen nicht erlaubt, diese Seite anzusehen." + +#: app/controllers/public/content_viewer_controller.rb:36 +#, fuzzy +msgid "You can contact the owner of this profile to request access then." msgstr "" "Es ist Ihnen nicht erlaubt diesen Inhalt anzusehen. Sie können den Besitzer " "dieses Profils kontaktieren und um Erlaubnis fragen." -#: app/controllers/public/content_viewer_controller.rb:114 +#: app/controllers/public/content_viewer_controller.rb:116 #, fuzzy msgid "Notification of new comments to '%s' was successfully canceled" msgstr "Benachrichtigung erfolgreich entfernt." -#: app/controllers/public/content_viewer_controller.rb:135 +#: app/controllers/public/content_viewer_controller.rb:137 #, fuzzy msgid "Comment succesfully updated" msgstr "Kommentar erfolgreich gelöscht" -#: app/controllers/public/content_viewer_controller.rb:138 +#: app/controllers/public/content_viewer_controller.rb:140 #, fuzzy msgid "Comment could not be updated" msgstr "%s konnte nicht hochgeladen werden" -#: app/controllers/public/content_viewer_controller.rb:143 +#: app/controllers/public/content_viewer_controller.rb:145 #, fuzzy msgid "Could not find the comment in the article" msgstr "Kann E-Mail nicht erstellen" -#: app/controllers/public/content_viewer_controller.rb:157 +#: app/controllers/public/content_viewer_controller.rb:159 #: app/controllers/my_profile/cms_controller.rb:264 msgid "Please type the words correctly" msgstr "Bitte geben Sie die Wörter korrekt ein" @@ -66,7 +70,6 @@ msgstr "Unternehmensprofil" #: app/controllers/public/search_controller.rb:151 #: app/models/people_block.rb:4 app/helpers/application_helper.rb:1097 #: app/helpers/assets_helper.rb:8 app/helpers/search_helper.rb:13 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:34 msgid "People" msgstr "Nutzer" @@ -74,7 +77,6 @@ msgstr "Nutzer" #: app/models/enterprises_block.rb:12 app/helpers/assets_helper.rb:10 #: app/helpers/search_helper.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/profile/_person_profile.rhtml:23 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:35 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:13 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:18 msgid "Enterprises" @@ -84,13 +86,11 @@ msgstr "Unternehmen" #: app/models/products_block.rb:8 app/models/products_block.rb:12 #: app/models/enterprise.rb:130 app/helpers/application_helper.rb:539 #: app/helpers/assets_helper.rb:9 app/views/search/_sellers_form.rhtml:8 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:36 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:22 msgid "Products" msgstr "Produkte" #: app/controllers/public/search_controller.rb:154 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:37 msgid "Upcoming events" msgstr "Anstehende Ereignisse" @@ -98,13 +98,11 @@ msgstr "Anstehende Ereignisse" #: app/models/communities_block.rb:4 app/helpers/application_helper.rb:524 #: app/helpers/application_helper.rb:1113 app/helpers/assets_helper.rb:11 #: app/helpers/search_helper.rb:14 app/views/profile/_person_profile.rhtml:41 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:38 msgid "Communities" msgstr "Communities" #: app/controllers/public/search_controller.rb:156 #: app/helpers/application_helper.rb:1081 app/helpers/search_helper.rb:11 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:39 msgid "Contents" msgstr "Inhalte" @@ -259,15 +257,7 @@ msgstr "Die E-Mail werden versandt" msgid "Could not create the e-mail" msgstr "Kann E-Mail nicht erstellen" -#: app/controllers/public/profile_controller.rb:373 -msgid "The content here is available to %s's friends only." -msgstr "Dieser Inhalt ist nur für %s's Freunde verfügbar." - #: app/controllers/public/profile_controller.rb:376 -msgid "The contents in this community is available to members only." -msgstr "Der Inhalt dieser Communitiy ist nur für Mitglieder verfügbar." - -#: app/controllers/public/profile_controller.rb:383 msgid "" "This profile is inaccessible. You don't have the permission to view the " "content here." @@ -275,7 +265,7 @@ msgstr "" "Dieses Profil ist nicht aufrufbar. Sie haben keine Berechtigungen, um es " "sich ansehen zu können." -#: app/controllers/public/profile_controller.rb:383 +#: app/controllers/public/profile_controller.rb:376 msgid "Oops ... you cannot go ahead here" msgstr "Oops.. Sie können hier leider nicht weitergehen" @@ -531,7 +521,7 @@ msgstr "Das Vorprodukt wurde nicht gefunden" #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:23 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:6 msgid "Name" msgstr "Name" @@ -770,7 +760,7 @@ msgstr "noosfero::plugin::activerecord" msgid "profile" msgstr "Profile" -#: app/models/product.rb:- app/models/article.rb:702 app/models/mailing.rb:- +#: app/models/product.rb:- app/models/article.rb:706 app/models/mailing.rb:- #: app/views/cms/view.rhtml:25 #: app/views/shared/reported_versions/_article.html.erb:3 #: app/views/shared/reported_versions/_comment.html.erb:3 @@ -810,15 +800,15 @@ msgstr "Aktiv" #: app/views/box_organizer/_link_list_block.rhtml:4 #: plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb:12 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:19 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:25 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:23 msgid "Address" msgstr "Adresse" #: app/models/product.rb:- app/models/create_enterprise.rb:6 #: app/views/profile_editor/_person_form.rhtml:13 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:8 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:8 msgid "Contact phone" msgstr "Kontakt-Telefonnummer" @@ -868,7 +858,7 @@ msgstr "Persönlicher Fußbereich (footer)" msgid "Theme" msgstr "Thema" -#: app/models/product.rb:- app/models/profile.rb:715 +#: app/models/product.rb:- app/models/profile.rb:723 msgid "Public profile" msgstr "öffentliches Profil" @@ -977,7 +967,7 @@ msgid "Abstract" msgstr "Zusammenfassung" #: app/models/product.rb:- app/models/action_tracker_notification.rb:- -#: app/models/article.rb:706 app/models/person.rb:263 app/models/profile.rb:9 +#: app/models/article.rb:710 app/models/person.rb:266 app/models/profile.rb:9 #: app/models/profile_categorization.rb:- app/views/profile/index.rhtml:28 #: app/views/profile/index.rhtml:33 msgid "Profile" @@ -1166,7 +1156,7 @@ msgstr "Ereignis" msgid "environment" msgstr "Umgebung" -#: app/models/product.rb:- app/models/organization.rb:99 +#: app/models/product.rb:- app/models/organization.rb:101 #: app/views/admin_panel/_site_info.rhtml:2 msgid "Contact email" msgstr "Kontakt-E-Mail" @@ -1232,12 +1222,13 @@ msgstr "Produktkategorie" #: app/models/product.rb:- app/models/price_detail.rb:- #: app/views/manage_products/index.rhtml:6 -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:37 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:55 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 msgid "Price" msgstr "Preis" #: app/models/product.rb:- app/models/certifier.rb:- -#: app/models/organization.rb:99 app/views/search/_product.rhtml:52 +#: app/models/organization.rb:101 app/views/search/_product.rhtml:52 #: app/views/search/_article_description.rhtml:4 #: app/views/profile_editor/_person_form.rhtml:10 #: app/views/cms/_uploaded_file.rhtml:5 @@ -1307,7 +1298,7 @@ msgstr "Autor" #: app/views/cms/suggest_an_article.rhtml:17 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:18 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:16 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:7 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:7 msgid "Email" msgstr "E-Mail" @@ -1408,7 +1399,7 @@ msgid "Accept products" msgstr "Produkte akzeptieren" #: app/models/product.rb:- app/models/create_enterprise.rb:8 -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 #: app/views/enterprise_validation/_details.rhtml:19 msgid "Acronym" msgstr "Abkürzung" @@ -1434,53 +1425,53 @@ msgstr "Position" msgid "Fetched at" msgstr "Abgeholt um" -#: app/models/product.rb:76 app/helpers/display_helper.rb:34 -#: app/helpers/display_helper.rb:43 +#: app/models/product.rb:80 app/helpers/display_helper.rb:42 +#: app/helpers/display_helper.rb:51 msgid "Uncategorized product" msgstr "Produkt ohne Kategorie" -#: app/models/product.rb:206 +#: app/models/product.rb:210 msgid "0%" msgstr "" -#: app/models/product.rb:207 +#: app/models/product.rb:211 msgid "25%" msgstr "" -#: app/models/product.rb:208 +#: app/models/product.rb:212 msgid "50%" msgstr "" -#: app/models/product.rb:209 +#: app/models/product.rb:213 msgid "75%" msgstr "" -#: app/models/product.rb:210 +#: app/models/product.rb:214 msgid "100%" msgstr "" -#: app/models/product.rb:234 +#: app/models/product.rb:238 #, fuzzy msgid " cert. " msgstr "Zertifizierung. " -#: app/models/product.rb:259 +#: app/models/product.rb:263 #, fuzzy msgid "Related products" msgstr "Produkte bewerten" -#: app/models/product.rb:260 app/models/contact.rb:- app/models/person.rb:204 -#: app/models/profile.rb:942 app/models/enterprise.rb:23 +#: app/models/product.rb:264 app/models/contact.rb:- app/models/person.rb:207 +#: app/models/profile.rb:950 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:11 app/views/search/_product.rhtml:59 #: app/views/search/_profile.rhtml:21 #: app/views/profile_editor/_person_form.rhtml:21 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:10 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:12 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:18 msgid "City" msgstr "Ort" -#: app/models/product.rb:261 app/views/search/_product.rhtml:65 +#: app/models/product.rb:265 app/views/search/_product.rhtml:65 #, fuzzy msgid "Qualifiers" msgstr "Kennzeichner" @@ -1547,7 +1538,7 @@ msgstr "Neu" #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:16 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:52 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:42 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:25 msgid "Save" msgstr "Speichern" @@ -1643,7 +1634,6 @@ msgstr "Rot erhöhen" #: app/views/search/_search_form.rhtml:24 #: app/views/cms/_text_editor_sidebar.rhtml:36 app/views/home/index.rhtml:61 #: app/views/profile_members/_add_admins.rhtml:5 -#: plugins/solr/views/search/_search_form.rhtml:24 msgid "Search" msgstr "Suche" @@ -1862,7 +1852,7 @@ msgstr "Betreff" msgid "Message" msgstr "Nachricht" -#: app/models/contact.rb:- app/models/person.rb:204 +#: app/models/contact.rb:- app/models/person.rb:207 #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:10 #: app/views/profile_editor/_person_form.rhtml:20 #: plugins/bsc/lib/bsc_plugin/contract.rb:46 @@ -1895,11 +1885,11 @@ msgstr "(gelöschte Nutzer)" msgid "(unauthenticated user)" msgstr "(nicht angemeldeter Nutzer)" -#: app/models/comment.rb:179 +#: app/models/comment.rb:183 msgid "[%s] you got a new comment!" msgstr "[%s] Sie haben einen neuen Kommentar erhalten!" -#: app/models/comment.rb:194 +#: app/models/comment.rb:198 #, fuzzy msgid "[%s] %s commented on a content of %s" msgstr "Meistkommentierte Inhalte" @@ -2000,7 +1990,7 @@ msgstr "" msgid "cyclical reference is not allowed." msgstr "" -#: app/models/article.rb:170 app/models/organization.rb:99 +#: app/models/article.rb:170 app/models/organization.rb:101 msgid "Tag list" msgstr "Tag Liste" @@ -2029,61 +2019,61 @@ msgstr "Für den ursprünglichen Artikel muss eine Sprache ausgewählt werden" msgid "Unknown" msgstr "" -#: app/models/article.rb:605 +#: app/models/article.rb:609 msgid "no comments" msgstr "Keine Kommentare" -#: app/models/article.rb:606 +#: app/models/article.rb:610 msgid "one comment" msgstr "Ein Kommentar" -#: app/models/article.rb:607 +#: app/models/article.rb:611 msgid "%s comments" msgstr "%s Kommentare" -#: app/models/article.rb:614 +#: app/models/article.rb:618 msgid "no views" msgstr "Keine Abrufe" -#: app/models/article.rb:615 +#: app/models/article.rb:619 msgid "one view" msgstr "ein Abruf" -#: app/models/article.rb:616 +#: app/models/article.rb:620 msgid "%s views" msgstr "%s Abrufe" -#: app/models/article.rb:621 +#: app/models/article.rb:625 msgid "Created at: " msgstr "Erstellt am: " -#: app/models/article.rb:703 +#: app/models/article.rb:707 #, fuzzy msgid "Published date" msgstr "Veröffentlicht am" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Older than one year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 #, fuzzy msgid "In the last year" msgstr "In der Galerie" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last month" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last week" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last day" msgstr "" -#: app/models/article.rb:707 app/helpers/application_helper.rb:614 +#: app/models/article.rb:711 app/helpers/application_helper.rb:614 #: app/views/search/_article_categories.rhtml:2 #: app/views/categories/index.rhtml:1 app/views/admin_panel/index.rhtml:41 #: app/views/content_viewer/view_page.rhtml:77 @@ -2375,16 +2365,21 @@ msgstr "" msgid "Redirects the user to his control panel." msgstr "Zurück zum Kontrollfeld" -#: app/models/environment.rb:579 +#: app/models/environment.rb:238 +#, fuzzy +msgid "This enterprise needs to be enabled." +msgstr "Ihr Unternehmen wurde geblockt" + +#: app/models/environment.rb:580 msgid "Only one Virtual Community can be the default one" msgstr "Nur eine virtuelle Community kann als Standard gewählt werden" -#: app/models/environment.rb:842 +#: app/models/environment.rb:843 #, fuzzy msgid "is not available." msgstr "Produkt ist nicht verfügbar" -#: app/models/environment.rb:850 +#: app/models/environment.rb:851 msgid "have unsupported languages." msgstr "" @@ -2622,9 +2617,9 @@ msgstr "Externe Inhalte" msgid "Feed title" msgstr "Titel" -#: app/models/external_feed.rb:- app/models/person.rb:266 -#: app/models/person.rb:277 app/models/organization.rb:121 -#: app/models/organization.rb:132 app/models/blog.rb:13 app/models/blog.rb:17 +#: app/models/external_feed.rb:- app/models/person.rb:269 +#: app/models/person.rb:280 app/models/organization.rb:123 +#: app/models/organization.rb:134 app/models/blog.rb:13 app/models/blog.rb:17 #: app/models/enterprise.rb:129 app/models/enterprise.rb:145 msgid "Blog" msgstr "Blog" @@ -2739,8 +2734,8 @@ msgstr "Validierungsmethoden" msgid "Restrictions" msgstr "Beschränkungen" -#: app/models/validation_info.rb:- app/models/person.rb:195 -#: app/views/profile_editor/_person_form.rhtml:60 +#: app/models/validation_info.rb:- app/models/person.rb:198 +#: app/views/profile_editor/_person_form.rhtml:62 msgid "Organization" msgstr "Organisation" @@ -2776,108 +2771,125 @@ msgstr "Schule" msgid "family" msgstr "Familie" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:14 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:14 msgid "Cell phone" msgstr "Mobiltelefon" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:15 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:15 msgid "Comercial phone" msgstr "geschäftliches Telefon" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:18 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:18 msgid "Nationality" msgstr "Nationalität" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:27 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:29 msgid "Schooling" msgstr "Ausbildung" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:52 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:54 msgid "Area of study" msgstr "Studienrichtung" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:59 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:61 msgid "Professional activity" msgstr "Berufliche Aktivitäten" -#: app/models/person.rb:195 app/models/enterprise.rb:23 -#: app/views/profile_editor/_person_form.rhtml:61 +#: app/models/person.rb:198 app/models/enterprise.rb:23 +#: app/views/profile_editor/_person_form.rhtml:63 msgid "Organization website" msgstr "Webseite der Organisation" -#: app/models/person.rb:198 +#: app/models/person.rb:201 msgid "Schooling status" msgstr "Schulabschluss" -#: app/models/person.rb:201 app/helpers/profile_editor_helper.rb:26 -#: app/views/profile_editor/_person_form.rhtml:45 +#: app/models/person.rb:204 app/helpers/profile_editor_helper.rb:26 +#: app/views/profile_editor/_person_form.rhtml:47 msgid "Education" msgstr "Bildung" -#: app/models/person.rb:201 +#: app/models/person.rb:204 msgid "Custom education" msgstr "Spezielle Ausbildung" -#: app/models/person.rb:201 app/views/profile_editor/_person_form.rhtml:55 +#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:57 msgid "Custom area of study" msgstr "Spezielles Ausbildungsgebiet" -#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:12 +#: app/models/person.rb:207 app/views/profile_editor/_person_form.rhtml:12 msgid "Contact information" msgstr "Kontaktinformationen" -#: app/models/person.rb:204 app/models/enterprise.rb:23 +#: app/models/person.rb:207 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:9 -#: app/views/shared/_organization_custom_fields.rhtml:16 +#: app/views/shared/_organization_custom_fields.rhtml:18 #: app/views/profile_editor/_person_form.rhtml:19 #: plugins/bsc/views/shared/_fields.html.erb:65 msgid "Country" msgstr "Land" -#: app/models/person.rb:204 +#: app/models/person.rb:207 msgid "Sex" msgstr "Geschlecht" -#: app/models/person.rb:204 +#: app/models/person.rb:207 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 msgid "Zip code" msgstr "Postleitzahl" -#: app/models/person.rb:235 +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:14 +#: app/views/profile_editor/_person_form.rhtml:25 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17 +#, fuzzy +msgid "District" +msgstr "Beschränkungen" + +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/profile_editor/_person_form.rhtml:24 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16 +#, fuzzy +msgid "Address reference" +msgstr "Adresse: " + +#: app/models/person.rb:238 msgid "%{fn} is already used by other user" msgstr "%{fn} wird bereits von einem anderen Nutzer benutzt" -#: app/models/person.rb:264 app/models/organization.rb:120 +#: app/models/person.rb:267 app/models/organization.rb:122 msgid "Image gallery" msgstr "Bildergalerie" -#: app/models/person.rb:265 app/models/organization.rb:119 +#: app/models/person.rb:268 app/models/organization.rb:121 #: app/helpers/application_helper.rb:532 app/helpers/application_helper.rb:541 msgid "Agenda" msgstr "Agenda" -#: app/models/person.rb:278 app/models/gallery.rb:4 app/models/gallery.rb:8 -#: app/models/organization.rb:133 app/views/search/_uploaded_file.rhtml:14 +#: app/models/person.rb:281 app/models/gallery.rb:4 app/models/gallery.rb:8 +#: app/models/organization.rb:135 app/views/search/_uploaded_file.rhtml:14 msgid "Gallery" msgstr "Galerie" -#: app/models/person.rb:390 +#: app/models/person.rb:393 msgid "none" msgstr "keine" -#: app/models/person.rb:391 +#: app/models/person.rb:394 msgid "one friend" msgstr "Ein Freund" -#: app/models/person.rb:392 +#: app/models/person.rb:395 msgid "%s friends" msgstr "%s Freunde" -#: app/models/person.rb:427 +#: app/models/person.rb:430 msgid "You just left %s." msgstr "Sie haben soeben %s verlassen." -#: app/models/person.rb:451 app/models/profile.rb:868 +#: app/models/person.rb:454 app/models/profile.rb:876 msgid "Edit Profile" msgstr "Profil ändern" @@ -2966,67 +2978,67 @@ msgstr "Mitglieder einladen" msgid "Send e-Mail to members" msgstr "Sende E-Mail an Mitglieder" -#: app/models/profile.rb:301 +#: app/models/profile.rb:305 #, fuzzy msgid "is not a template." msgstr "Nutze diese Vorlage" -#: app/models/profile.rb:613 +#: app/models/profile.rb:621 msgid "%s can't have members" msgstr "%s kann keine Mitglieder haben" -#: app/models/profile.rb:634 +#: app/models/profile.rb:642 msgid "%s can't has moderators" msgstr "%s kann keine Moderatoren haben" -#: app/models/profile.rb:715 +#: app/models/profile.rb:723 msgid "Private profile" msgstr "persönliches Profil" -#: app/models/profile.rb:812 +#: app/models/profile.rb:820 msgid "Since: " msgstr "Seit: " -#: app/models/profile.rb:827 +#: app/models/profile.rb:835 msgid "no activity" msgstr "keine Aktivität" -#: app/models/profile.rb:828 +#: app/models/profile.rb:836 msgid "one activity" msgstr "eine Aktivität" -#: app/models/profile.rb:829 +#: app/models/profile.rb:837 msgid "%s activities" msgstr "%s Aktivitäten" -#: app/models/profile.rb:835 +#: app/models/profile.rb:843 msgid "no members" msgstr "keine Mitglieder" -#: app/models/profile.rb:836 +#: app/models/profile.rb:844 msgid "one member" msgstr "Ein Mitglied" -#: app/models/profile.rb:837 +#: app/models/profile.rb:845 msgid "%s members" msgstr "%s Mitglieder" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 #, fuzzy msgid "facets|Enabled" msgstr "Aktiviert" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 #, fuzzy msgid "facets|Not enabled" msgstr "%s war nicht aktiviert." -#: app/models/profile.rb:940 +#: app/models/profile.rb:948 #, fuzzy msgid "Situation" msgstr "Einladung" -#: app/models/profile.rb:970 +#: app/models/profile.rb:978 msgid "Profile Info and settings" msgstr "Profilinformationen und Einstellungen" @@ -3066,7 +3078,7 @@ msgstr "Kennzeichner" msgid "Certifier" msgstr "Bestätigender" -#: app/models/unit.rb:- app/views/catalog/index.rhtml:37 +#: app/models/unit.rb:- app/views/catalog/index.rhtml:59 msgid "unit" msgstr "Einheit" @@ -3494,23 +3506,23 @@ msgstr "Kategorie Profile" msgid "profilecategorization" msgstr "Profile kategorisieren" -#: app/models/create_enterprise.rb:7 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:101 msgid "Contact person" msgstr "Kontaktperson" -#: app/models/create_enterprise.rb:9 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:101 msgid "Foundation year" msgstr "Gründungsjahr" -#: app/models/create_enterprise.rb:10 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:101 msgid "Legal form" msgstr "Rechtsform" -#: app/models/create_enterprise.rb:11 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:101 msgid "Economic activity" msgstr "Tätigkeitsfeld" -#: app/models/create_enterprise.rb:12 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:101 msgid "Management information" msgstr "Verwaltungsinformationen" @@ -3643,15 +3655,15 @@ msgstr "% {requestor} lädt Sie ein, der Community %{community} beizutreten." msgid " is inviting you to join \"\" on ." msgstr " lädt Sie ein, \"\" auf zu nutzen." -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 msgid "Display name" msgstr "Namen anzeigen" -#: app/models/organization.rb:117 +#: app/models/organization.rb:119 msgid "Community's profile" msgstr "Communities Profil" -#: app/models/organization.rb:118 +#: app/models/organization.rb:120 msgid "Invite Friends" msgstr "Freunde einladen" @@ -3753,9 +3765,9 @@ msgid "Activities short description" msgstr "Kurzbeschreibung der Aktivitäten" #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:12 -#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/shared/_organization_custom_fields.rhtml:15 #: app/views/profile_editor/_person_form.rhtml:22 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:13 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:19 msgid "ZIP code" msgstr "Postleitzahl" @@ -4389,11 +4401,11 @@ msgstr "Belegt" msgid "Sign out of chat" msgstr "Chat beenden" -#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:12 +#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:20 msgid "No product" msgstr "Kein Produkt" -#: app/helpers/display_helper.rb:59 +#: app/helpers/display_helper.rb:67 msgid "Are you sure you want to visit this web site?" msgstr "Sind Sie sicher, dass Sie diese Web-Site besuchen möchten?" @@ -4688,7 +4700,7 @@ msgstr "%{distance} Tage" msgid "Source: %s" msgstr "Quelle: %s" -#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:17 +#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:39 #: app/views/search/_image.rhtml:43 app/views/cms/_text_editor_sidebar.rhtml:3 #: app/views/manage_products/_display_image.rhtml:6 msgid "Zoom in" @@ -4743,6 +4755,14 @@ msgstr "" msgid "Type in a search term" msgstr "Geben Sie einen Suchbegriff an" +#: app/helpers/application_helper.rb:1418 +msgid "The content here is available to %s's friends only." +msgstr "Dieser Inhalt ist nur für %s's Freunde verfügbar." + +#: app/helpers/application_helper.rb:1421 +msgid "The contents in this community is available to members only." +msgstr "Der Inhalt dieser Communitiy ist nur für Mitglieder verfügbar." + #: app/helpers/events_helper.rb:4 msgid "Select a day on the left to display it's events here" msgstr "" @@ -4901,6 +4921,11 @@ msgstr "Veröffentlichen" msgid "Delete" msgstr "Löschen" +#: app/helpers/catalog_helper.rb:7 +#, fuzzy +msgid "Start" +msgstr "Startdatum" + #: app/helpers/blog_helper.rb:10 msgid "New post" msgstr "Neuer Eintrag" @@ -5601,49 +5626,59 @@ msgstr "" msgid "I want to receive a copy of the message in my e-mail." msgstr "Ich möchte eine Kopie der Nachricht in meiner E-Mail." -#: app/views/catalog/index.rhtml:5 app/views/blocks/profile_info.rhtml:21 +#: app/views/catalog/index.rhtml:4 app/views/blocks/profile_info.rhtml:21 #: app/views/profile/_organization_profile.rhtml:26 msgid "Products/Services" msgstr "Produkte/Dienste" -#: app/views/catalog/index.rhtml:20 app/views/search/_image.rhtml:35 +#: app/views/catalog/index.rhtml:16 +#, fuzzy +msgid "There are no sub-categories for %s" +msgstr "Es gibt keine Kategorie." + +#: app/views/catalog/index.rhtml:34 +#, fuzzy +msgid "Highlighted product" +msgstr "Markiere dieses Produkt" + +#: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35 #: app/views/search/_image.rhtml:47 msgid "No image" msgstr "Kein Bild" -#: app/views/catalog/index.rhtml:30 +#: app/views/catalog/index.rhtml:52 msgid "from " msgstr "von " -#: app/views/catalog/index.rhtml:31 +#: app/views/catalog/index.rhtml:53 msgid "by " msgstr "von " -#: app/views/catalog/index.rhtml:37 +#: app/views/catalog/index.rhtml:59 msgid " / " msgstr " / " -#: app/views/catalog/index.rhtml:45 +#: app/views/catalog/index.rhtml:67 msgid "description" msgstr "Beschreibung" -#: app/views/catalog/index.rhtml:55 +#: app/views/catalog/index.rhtml:77 msgid "price composition" msgstr "Preiszusammensetzung" -#: app/views/catalog/index.rhtml:78 +#: app/views/catalog/index.rhtml:100 msgid "inputs and raw materials" msgstr "Vorprodukte/-dienste oder Rohstoffe" -#: app/views/catalog/index.rhtml:84 +#: app/views/catalog/index.rhtml:106 msgid "%{amount_used} %{unit} of" msgstr "{amount_used} %{unit} von" -#: app/views/catalog/index.rhtml:95 +#: app/views/catalog/index.rhtml:117 msgid "qualifiers" msgstr "Kennzeichner" -#: app/views/catalog/index.rhtml:103 +#: app/views/catalog/index.rhtml:125 msgid "product unavailable" msgstr "Produkt ist nicht verfügbar" @@ -5733,7 +5768,7 @@ msgstr "Verwalte %s" #: app/views/profile_editor/edit.rhtml:64 app/views/cms/view.rhtml:9 #: app/views/tasks/index.rhtml:37 app/views/tasks/index.rhtml:62 #: app/views/box_organizer/index.rhtml:5 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:43 msgid "Back to control panel" msgstr "Zurück zum Kontrollpanel" @@ -5904,7 +5939,7 @@ msgstr "Ort" #: app/views/maps/edit_location.rhtml:13 #: app/views/shared/_organization_custom_fields.rhtml:12 #: app/views/profile_editor/_person_form.rhtml:23 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15 msgid "Address (street and number)" msgstr "Adresse (Straße und Nummer)" @@ -6357,22 +6392,18 @@ msgid "Supplier" msgstr "Zulieferer" #: app/views/search/index.rhtml:7 app/views/search/category_index.rhtml:7 -#: plugins/solr/views/solr_plugin_public/index.rhtml:7 msgid "Search Results" msgstr "Suchresultate" #: app/views/search/index.rhtml:14 app/views/search/category_index.rhtml:14 -#: plugins/solr/views/solr_plugin_public/index.rhtml:14 msgid "Sub-categories" msgstr "Sub-Kategorien" #: app/views/search/index.rhtml:16 app/views/search/category_index.rhtml:16 -#: plugins/solr/views/solr_plugin_public/index.rhtml:16 msgid "No sub-categories" msgstr "Keine Sub-Kategorien" #: app/views/search/_facets_unselect_menu.rhtml:3 -#: plugins/solr/views/search/_facets_unselect_menu.rhtml:3 #, fuzzy msgid "Applied filters" msgstr "Dateien hochladen" @@ -7342,7 +7373,7 @@ msgstr "" msgid "Home phone" msgstr "Private Telefonnummer" -#: app/views/profile_editor/_person_form.rhtml:48 +#: app/views/profile_editor/_person_form.rhtml:50 msgid "Custom formation" msgstr "Angepasste Formatierung" @@ -10216,7 +10247,7 @@ msgid "[%s] Bsc management transferred to you." msgstr "[%s] Die Verwaltung von Bsc wurde Ihnen übertragen." #: plugins/bsc/lib/bsc_plugin/contract.rb:33 -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Opened" msgstr "Geöffnet" @@ -10475,94 +10506,105 @@ msgstr "" msgid "The tolerance time for editing this content is over." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:10 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:13 msgid "Option updated successfully." msgstr "Optionen erfolgreich aktualisiert." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:12 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:15 msgid "Option wasn't updated successfully." msgstr "Optionen konnte nicht erfolgreich aktualisiert werden." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:98 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:116 msgid "Request sent successfully. Check your email." msgstr "" "Die Antwort wurde erfolgreich gesendet. Prüfen Sie Ihren E-Mail-Eingang." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:121 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:139 msgid "Basket displayed." msgstr "Einkaufskorb angezeigt." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:140 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:158 msgid "Basket hidden." msgstr "Einkaufskorb versteckt." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:162 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:186 +#, fuzzy +msgid "Delivery option updated." +msgstr "Preis der Auslieferung:" + +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:199 msgid "Can't join items from different enterprises." msgstr "" "Dinge aus unterschiedlichen Firmen können nicht zusammengeführt werden." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:176 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:213 msgid "There is no basket." msgstr "Es gibt keinen Einkaufskorb." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:192 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:229 msgid "This enterprise doesn't have this product." msgstr "Dieses Unternehmen besitzt das gewählte Produkt nicht." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:206 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:243 msgid "The basket doesn't have this product." msgstr "Der Einkaufskorb beinhaltet das gewählte Produkt nicht." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:220 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:257 msgid "Invalid quantity." msgstr "Ungültige Menge." -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:11 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:12 msgid "A shopping basket feature for enterprises" msgstr "Ein Einkaufskorb für Unternehmen" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:17 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:37 msgid "Add to basket" msgstr "Zum Einkaufskorb hinzufügen" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:44 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:65 msgid "Shopping basket" msgstr "Einkaufskorb" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:47 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:68 msgid "Purchase reports" msgstr "Kaufbelege" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:8 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:10 msgid "[%s] Your buy request was performed successfully." msgstr "[%s] Ihr beabsichtigter Kauf wurde erfolgreich durchgeführt." -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:21 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:25 msgid "[%s] You have a new buy request from %s." msgstr "[%s] Sie haben eine neue Kaufanfrage von %s." -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:22 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41 +#, fuzzy +msgid "Free delivery" +msgstr "Auslieferung" + +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7 msgid "Delivery" msgstr "Auslieferung" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:35 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53 msgid "Item name" msgstr "Name der Sache" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:52 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76 #: plugins/shopping_cart/views/cart.html.erb:9 msgid "Total:" msgstr "Gesamt:" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Canceled" msgstr "Abgebrochen" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Confirmed" msgstr "Bestätigt" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Shipped" msgstr "Ausgeliefert" @@ -11430,6 +11472,27 @@ msgstr "Wert des Einkaufs" msgid "E-mail" msgstr "E-Mail" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9 +#, fuzzy +msgid "Delivery option" +msgstr "Preis der Auslieferung:" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Payment" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 +#, fuzzy +msgid "Change" +msgstr "Bild ändern" + #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:1 msgid "Basket options" msgstr "Optionen zum Einkaufskorb" @@ -11438,10 +11501,30 @@ msgstr "Optionen zum Einkaufskorb" msgid "Delivery?" msgstr "Auslieferung?" -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:6 -msgid "Delivery price:" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +msgid "Option" +msgstr "Option" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:24 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:32 +#, fuzzy +msgid "Remove option" +msgstr "Mehr Optionen" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:27 +msgid "ADD NEW OPTION" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 +#, fuzzy +msgid "Free delivery price:" msgstr "Preis der Auslieferung:" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 +msgid "Empty stands for no free delivery price." +msgstr "" + #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10 msgid "This is a notification e-mail about your buy request on %s." msgstr "" @@ -11469,16 +11552,29 @@ msgstr "Bitte prüfen Sie untenstehende Informationen auf Korrektheit:" msgid "Phone number" msgstr "Telefonnummer" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:37 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Money" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +#, fuzzy +msgid "Check" +msgstr "alles auswählen" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47 msgid "Here are the products you bought:" msgstr "Hier sind die von Ihnen gekauften Produkte:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51 msgid "Thanks for buying with us!" msgstr "Vielen Dank für Ihren Einkauf bei uns!" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:45 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51 msgid "A service of %s." msgstr "Eine Dienstleistung von %s." @@ -11490,25 +11586,25 @@ msgstr "Das ist eine Anfrage von %s." msgid "Below follows the customer informations:" msgstr "Nachfolgend die Informationen über den Kunden:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45 msgid "And here are the items bought by this customer:" msgstr "Dies sind die durch den Kunden eingekauften Dinge:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:40 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49 msgid "If there are any problems with this email contact the admin of %s." msgstr "" "Falls es Probleme mit dieser E-Mail gibt, wenden Sie sich bitte an den " "Administrator von %s." -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:14 msgid "Delivery Address" msgstr "Auslieferungsadresse" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:23 msgid "Send buy request" msgstr "Kaufanfrage senden" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/send_request.html.erb:1 +#: plugins/shopping_cart/views/shopping_cart_plugin/send_request.html.erb:1 msgid "Request sent successfully check your email." msgstr "Anfrage erfolgreich zu Ihrer E-Mail-Adresse gesendet." @@ -11660,9 +11756,6 @@ msgstr "" #~ msgid "Remove this comment and all its replies" #~ msgstr "Kommentar und alle Antworten entfernen" -#~ msgid "Option" -#~ msgstr "Option" - #~ msgid "What's new" #~ msgstr "Was ist neu" @@ -11794,9 +11887,6 @@ msgstr "" #~ msgid "product categorization" #~ msgstr "Produktkategorien" -#~ msgid "There is no categories." -#~ msgstr "Es gibt keine Kategorie." - #~ msgid "Listing sellers of %s witin %s km from %s %s" #~ msgstr "Zeige Anbieter von %s im Umkreis von %km von %s %s" diff --git a/po/eo/noosfero.po b/po/eo/noosfero.po index c185de6..011ca0e 100644 --- a/po/eo/noosfero.po +++ b/po/eo/noosfero.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.39.1\n" -"POT-Creation-Date: 2013-01-03 20:39-0000\n" +"Project-Id-Version: noosfero 0.39.3\n" +"POT-Creation-Date: 2013-01-19 21:42-0000\n" "PO-Revision-Date: 2011-03-30 20:52-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,30 +24,32 @@ msgstr "" msgid "Please enter a valid email address." msgstr "" -#: app/controllers/public/content_viewer_controller.rb:38 -msgid "" -"You are not allowed to view this content. You can contact the owner of this " -"profile to request access then." +#: app/controllers/public/content_viewer_controller.rb:35 +msgid "You are not allowed to view this content." +msgstr "" + +#: app/controllers/public/content_viewer_controller.rb:36 +msgid "You can contact the owner of this profile to request access then." msgstr "" -#: app/controllers/public/content_viewer_controller.rb:114 +#: app/controllers/public/content_viewer_controller.rb:116 msgid "Notification of new comments to '%s' was successfully canceled" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:135 +#: app/controllers/public/content_viewer_controller.rb:137 msgid "Comment succesfully updated" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:138 +#: app/controllers/public/content_viewer_controller.rb:140 #, fuzzy msgid "Comment could not be updated" msgstr "Unu komento" -#: app/controllers/public/content_viewer_controller.rb:143 +#: app/controllers/public/content_viewer_controller.rb:145 msgid "Could not find the comment in the article" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:157 +#: app/controllers/public/content_viewer_controller.rb:159 #: app/controllers/my_profile/cms_controller.rb:264 msgid "Please type the words correctly" msgstr "" @@ -59,7 +61,6 @@ msgstr "" #: app/controllers/public/search_controller.rb:151 #: app/models/people_block.rb:4 app/helpers/application_helper.rb:1097 #: app/helpers/assets_helper.rb:8 app/helpers/search_helper.rb:13 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:34 msgid "People" msgstr "" @@ -67,7 +68,6 @@ msgstr "" #: app/models/enterprises_block.rb:12 app/helpers/assets_helper.rb:10 #: app/helpers/search_helper.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/profile/_person_profile.rhtml:23 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:35 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:13 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:18 msgid "Enterprises" @@ -77,13 +77,11 @@ msgstr "" #: app/models/products_block.rb:8 app/models/products_block.rb:12 #: app/models/enterprise.rb:130 app/helpers/application_helper.rb:539 #: app/helpers/assets_helper.rb:9 app/views/search/_sellers_form.rhtml:8 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:36 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:22 msgid "Products" msgstr "" #: app/controllers/public/search_controller.rb:154 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:37 msgid "Upcoming events" msgstr "" @@ -91,13 +89,11 @@ msgstr "" #: app/models/communities_block.rb:4 app/helpers/application_helper.rb:524 #: app/helpers/application_helper.rb:1113 app/helpers/assets_helper.rb:11 #: app/helpers/search_helper.rb:14 app/views/profile/_person_profile.rhtml:41 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:38 msgid "Communities" msgstr "" #: app/controllers/public/search_controller.rb:156 #: app/helpers/application_helper.rb:1081 app/helpers/search_helper.rb:11 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:39 msgid "Contents" msgstr "" @@ -238,21 +234,13 @@ msgstr "" msgid "Could not create the e-mail" msgstr "" -#: app/controllers/public/profile_controller.rb:373 -msgid "The content here is available to %s's friends only." -msgstr "" - #: app/controllers/public/profile_controller.rb:376 -msgid "The contents in this community is available to members only." -msgstr "" - -#: app/controllers/public/profile_controller.rb:383 msgid "" "This profile is inaccessible. You don't have the permission to view the " "content here." msgstr "" -#: app/controllers/public/profile_controller.rb:383 +#: app/controllers/public/profile_controller.rb:376 msgid "Oops ... you cannot go ahead here" msgstr "" @@ -498,7 +486,7 @@ msgstr "" #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:23 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:6 msgid "Name" msgstr "" @@ -731,7 +719,7 @@ msgstr "" msgid "profile" msgstr "" -#: app/models/product.rb:- app/models/article.rb:702 app/models/mailing.rb:- +#: app/models/product.rb:- app/models/article.rb:706 app/models/mailing.rb:- #: app/views/cms/view.rhtml:25 #: app/views/shared/reported_versions/_article.html.erb:3 #: app/views/shared/reported_versions/_comment.html.erb:3 @@ -771,15 +759,15 @@ msgstr "" #: app/views/box_organizer/_link_list_block.rhtml:4 #: plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb:12 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:19 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:25 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:23 msgid "Address" msgstr "" #: app/models/product.rb:- app/models/create_enterprise.rb:6 #: app/views/profile_editor/_person_form.rhtml:13 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:8 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:8 msgid "Contact phone" msgstr "" @@ -829,7 +817,7 @@ msgstr "" msgid "Theme" msgstr "" -#: app/models/product.rb:- app/models/profile.rb:715 +#: app/models/product.rb:- app/models/profile.rb:723 msgid "Public profile" msgstr "" @@ -935,7 +923,7 @@ msgid "Abstract" msgstr "" #: app/models/product.rb:- app/models/action_tracker_notification.rb:- -#: app/models/article.rb:706 app/models/person.rb:263 app/models/profile.rb:9 +#: app/models/article.rb:710 app/models/person.rb:266 app/models/profile.rb:9 #: app/models/profile_categorization.rb:- app/views/profile/index.rhtml:28 #: app/views/profile/index.rhtml:33 msgid "Profile" @@ -1116,7 +1104,7 @@ msgstr "" msgid "environment" msgstr "" -#: app/models/product.rb:- app/models/organization.rb:99 +#: app/models/product.rb:- app/models/organization.rb:101 #: app/views/admin_panel/_site_info.rhtml:2 msgid "Contact email" msgstr "" @@ -1180,12 +1168,13 @@ msgstr "" #: app/models/product.rb:- app/models/price_detail.rb:- #: app/views/manage_products/index.rhtml:6 -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:37 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:55 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 msgid "Price" msgstr "" #: app/models/product.rb:- app/models/certifier.rb:- -#: app/models/organization.rb:99 app/views/search/_product.rhtml:52 +#: app/models/organization.rb:101 app/views/search/_product.rhtml:52 #: app/views/search/_article_description.rhtml:4 #: app/views/profile_editor/_person_form.rhtml:10 #: app/views/cms/_uploaded_file.rhtml:5 @@ -1255,7 +1244,7 @@ msgstr "" #: app/views/cms/suggest_an_article.rhtml:17 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:18 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:16 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:7 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:7 msgid "Email" msgstr "" @@ -1353,7 +1342,7 @@ msgid "Accept products" msgstr "" #: app/models/product.rb:- app/models/create_enterprise.rb:8 -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 #: app/views/enterprise_validation/_details.rhtml:19 msgid "Acronym" msgstr "" @@ -1379,51 +1368,51 @@ msgstr "" msgid "Fetched at" msgstr "" -#: app/models/product.rb:76 app/helpers/display_helper.rb:34 -#: app/helpers/display_helper.rb:43 +#: app/models/product.rb:80 app/helpers/display_helper.rb:42 +#: app/helpers/display_helper.rb:51 msgid "Uncategorized product" msgstr "" -#: app/models/product.rb:206 +#: app/models/product.rb:210 msgid "0%" msgstr "" -#: app/models/product.rb:207 +#: app/models/product.rb:211 msgid "25%" msgstr "" -#: app/models/product.rb:208 +#: app/models/product.rb:212 msgid "50%" msgstr "" -#: app/models/product.rb:209 +#: app/models/product.rb:213 msgid "75%" msgstr "" -#: app/models/product.rb:210 +#: app/models/product.rb:214 msgid "100%" msgstr "" -#: app/models/product.rb:234 +#: app/models/product.rb:238 msgid " cert. " msgstr "" -#: app/models/product.rb:259 +#: app/models/product.rb:263 msgid "Related products" msgstr "" -#: app/models/product.rb:260 app/models/contact.rb:- app/models/person.rb:204 -#: app/models/profile.rb:942 app/models/enterprise.rb:23 +#: app/models/product.rb:264 app/models/contact.rb:- app/models/person.rb:207 +#: app/models/profile.rb:950 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:11 app/views/search/_product.rhtml:59 #: app/views/search/_profile.rhtml:21 #: app/views/profile_editor/_person_form.rhtml:21 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:10 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:12 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:18 msgid "City" msgstr "" -#: app/models/product.rb:261 app/views/search/_product.rhtml:65 +#: app/models/product.rb:265 app/views/search/_product.rhtml:65 msgid "Qualifiers" msgstr "" @@ -1489,7 +1478,7 @@ msgstr "" #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:16 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:52 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:42 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:25 msgid "Save" msgstr "" @@ -1585,7 +1574,6 @@ msgstr "" #: app/views/search/_search_form.rhtml:24 #: app/views/cms/_text_editor_sidebar.rhtml:36 app/views/home/index.rhtml:61 #: app/views/profile_members/_add_admins.rhtml:5 -#: plugins/solr/views/search/_search_form.rhtml:24 msgid "Search" msgstr "" @@ -1794,7 +1782,7 @@ msgstr "" msgid "Message" msgstr "" -#: app/models/contact.rb:- app/models/person.rb:204 +#: app/models/contact.rb:- app/models/person.rb:207 #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:10 #: app/views/profile_editor/_person_form.rhtml:20 #: plugins/bsc/lib/bsc_plugin/contract.rb:46 @@ -1827,11 +1815,11 @@ msgstr "" msgid "(unauthenticated user)" msgstr "" -#: app/models/comment.rb:179 +#: app/models/comment.rb:183 msgid "[%s] you got a new comment!" msgstr "" -#: app/models/comment.rb:194 +#: app/models/comment.rb:198 #, fuzzy msgid "[%s] %s commented on a content of %s" msgstr "Neniu komento" @@ -1924,7 +1912,7 @@ msgstr "" msgid "cyclical reference is not allowed." msgstr "" -#: app/models/article.rb:170 app/models/organization.rb:99 +#: app/models/article.rb:170 app/models/organization.rb:101 msgid "Tag list" msgstr "" @@ -1952,62 +1940,62 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/article.rb:605 +#: app/models/article.rb:609 #, fuzzy msgid "no comments" msgstr "Unu komento" -#: app/models/article.rb:606 +#: app/models/article.rb:610 #, fuzzy msgid "one comment" msgstr "Unu komento" -#: app/models/article.rb:607 +#: app/models/article.rb:611 #, fuzzy msgid "%s comments" msgstr "Unu komento" -#: app/models/article.rb:614 +#: app/models/article.rb:618 msgid "no views" msgstr "" -#: app/models/article.rb:615 +#: app/models/article.rb:619 msgid "one view" msgstr "" -#: app/models/article.rb:616 +#: app/models/article.rb:620 msgid "%s views" msgstr "" -#: app/models/article.rb:621 +#: app/models/article.rb:625 msgid "Created at: " msgstr "" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Published date" msgstr "" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Older than one year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last month" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last week" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last day" msgstr "" -#: app/models/article.rb:707 app/helpers/application_helper.rb:614 +#: app/models/article.rb:711 app/helpers/application_helper.rb:614 #: app/views/search/_article_categories.rhtml:2 #: app/views/categories/index.rhtml:1 app/views/admin_panel/index.rhtml:41 #: app/views/content_viewer/view_page.rhtml:77 @@ -2290,15 +2278,19 @@ msgstr "" msgid "Redirects the user to his control panel." msgstr "" -#: app/models/environment.rb:579 +#: app/models/environment.rb:238 +msgid "This enterprise needs to be enabled." +msgstr "" + +#: app/models/environment.rb:580 msgid "Only one Virtual Community can be the default one" msgstr "" -#: app/models/environment.rb:842 +#: app/models/environment.rb:843 msgid "is not available." msgstr "" -#: app/models/environment.rb:850 +#: app/models/environment.rb:851 msgid "have unsupported languages." msgstr "" @@ -2527,9 +2519,9 @@ msgstr "" msgid "Feed title" msgstr "" -#: app/models/external_feed.rb:- app/models/person.rb:266 -#: app/models/person.rb:277 app/models/organization.rb:121 -#: app/models/organization.rb:132 app/models/blog.rb:13 app/models/blog.rb:17 +#: app/models/external_feed.rb:- app/models/person.rb:269 +#: app/models/person.rb:280 app/models/organization.rb:123 +#: app/models/organization.rb:134 app/models/blog.rb:13 app/models/blog.rb:17 #: app/models/enterprise.rb:129 app/models/enterprise.rb:145 msgid "Blog" msgstr "" @@ -2625,8 +2617,8 @@ msgstr "" msgid "Restrictions" msgstr "" -#: app/models/validation_info.rb:- app/models/person.rb:195 -#: app/views/profile_editor/_person_form.rhtml:60 +#: app/models/validation_info.rb:- app/models/person.rb:198 +#: app/views/profile_editor/_person_form.rhtml:62 msgid "Organization" msgstr "" @@ -2662,108 +2654,123 @@ msgstr "" msgid "family" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:14 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:14 msgid "Cell phone" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:15 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:15 msgid "Comercial phone" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:18 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:18 msgid "Nationality" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:27 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:29 msgid "Schooling" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:52 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:54 msgid "Area of study" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:59 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:61 msgid "Professional activity" msgstr "" -#: app/models/person.rb:195 app/models/enterprise.rb:23 -#: app/views/profile_editor/_person_form.rhtml:61 +#: app/models/person.rb:198 app/models/enterprise.rb:23 +#: app/views/profile_editor/_person_form.rhtml:63 msgid "Organization website" msgstr "" -#: app/models/person.rb:198 +#: app/models/person.rb:201 msgid "Schooling status" msgstr "" -#: app/models/person.rb:201 app/helpers/profile_editor_helper.rb:26 -#: app/views/profile_editor/_person_form.rhtml:45 +#: app/models/person.rb:204 app/helpers/profile_editor_helper.rb:26 +#: app/views/profile_editor/_person_form.rhtml:47 msgid "Education" msgstr "" -#: app/models/person.rb:201 +#: app/models/person.rb:204 msgid "Custom education" msgstr "" -#: app/models/person.rb:201 app/views/profile_editor/_person_form.rhtml:55 +#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:57 msgid "Custom area of study" msgstr "" -#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:12 +#: app/models/person.rb:207 app/views/profile_editor/_person_form.rhtml:12 msgid "Contact information" msgstr "" -#: app/models/person.rb:204 app/models/enterprise.rb:23 +#: app/models/person.rb:207 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:9 -#: app/views/shared/_organization_custom_fields.rhtml:16 +#: app/views/shared/_organization_custom_fields.rhtml:18 #: app/views/profile_editor/_person_form.rhtml:19 #: plugins/bsc/views/shared/_fields.html.erb:65 msgid "Country" msgstr "" -#: app/models/person.rb:204 +#: app/models/person.rb:207 msgid "Sex" msgstr "" -#: app/models/person.rb:204 +#: app/models/person.rb:207 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 msgid "Zip code" msgstr "" -#: app/models/person.rb:235 +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:14 +#: app/views/profile_editor/_person_form.rhtml:25 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17 +msgid "District" +msgstr "" + +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/profile_editor/_person_form.rhtml:24 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16 +msgid "Address reference" +msgstr "" + +#: app/models/person.rb:238 msgid "%{fn} is already used by other user" msgstr "" -#: app/models/person.rb:264 app/models/organization.rb:120 +#: app/models/person.rb:267 app/models/organization.rb:122 msgid "Image gallery" msgstr "" -#: app/models/person.rb:265 app/models/organization.rb:119 +#: app/models/person.rb:268 app/models/organization.rb:121 #: app/helpers/application_helper.rb:532 app/helpers/application_helper.rb:541 msgid "Agenda" msgstr "" -#: app/models/person.rb:278 app/models/gallery.rb:4 app/models/gallery.rb:8 -#: app/models/organization.rb:133 app/views/search/_uploaded_file.rhtml:14 +#: app/models/person.rb:281 app/models/gallery.rb:4 app/models/gallery.rb:8 +#: app/models/organization.rb:135 app/views/search/_uploaded_file.rhtml:14 msgid "Gallery" msgstr "" -#: app/models/person.rb:390 +#: app/models/person.rb:393 msgid "none" msgstr "" -#: app/models/person.rb:391 +#: app/models/person.rb:394 msgid "one friend" msgstr "" -#: app/models/person.rb:392 +#: app/models/person.rb:395 msgid "%s friends" msgstr "" -#: app/models/person.rb:427 +#: app/models/person.rb:430 msgid "You just left %s." msgstr "" -#: app/models/person.rb:451 app/models/profile.rb:868 +#: app/models/person.rb:454 app/models/profile.rb:876 msgid "Edit Profile" msgstr "" @@ -2851,63 +2858,63 @@ msgstr "" msgid "Send e-Mail to members" msgstr "" -#: app/models/profile.rb:301 +#: app/models/profile.rb:305 msgid "is not a template." msgstr "" -#: app/models/profile.rb:613 +#: app/models/profile.rb:621 msgid "%s can't have members" msgstr "" -#: app/models/profile.rb:634 +#: app/models/profile.rb:642 msgid "%s can't has moderators" msgstr "" -#: app/models/profile.rb:715 +#: app/models/profile.rb:723 msgid "Private profile" msgstr "" -#: app/models/profile.rb:812 +#: app/models/profile.rb:820 msgid "Since: " msgstr "" -#: app/models/profile.rb:827 +#: app/models/profile.rb:835 msgid "no activity" msgstr "" -#: app/models/profile.rb:828 +#: app/models/profile.rb:836 msgid "one activity" msgstr "" -#: app/models/profile.rb:829 +#: app/models/profile.rb:837 msgid "%s activities" msgstr "" -#: app/models/profile.rb:835 +#: app/models/profile.rb:843 msgid "no members" msgstr "" -#: app/models/profile.rb:836 +#: app/models/profile.rb:844 msgid "one member" msgstr "" -#: app/models/profile.rb:837 +#: app/models/profile.rb:845 msgid "%s members" msgstr "" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 msgid "facets|Enabled" msgstr "" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 msgid "facets|Not enabled" msgstr "" -#: app/models/profile.rb:940 +#: app/models/profile.rb:948 msgid "Situation" msgstr "" -#: app/models/profile.rb:970 +#: app/models/profile.rb:978 msgid "Profile Info and settings" msgstr "" @@ -2947,7 +2954,7 @@ msgstr "" msgid "Certifier" msgstr "" -#: app/models/unit.rb:- app/views/catalog/index.rhtml:37 +#: app/models/unit.rb:- app/views/catalog/index.rhtml:59 msgid "unit" msgstr "" @@ -3336,23 +3343,23 @@ msgstr "" msgid "profilecategorization" msgstr "" -#: app/models/create_enterprise.rb:7 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:101 msgid "Contact person" msgstr "" -#: app/models/create_enterprise.rb:9 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:101 msgid "Foundation year" msgstr "" -#: app/models/create_enterprise.rb:10 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:101 msgid "Legal form" msgstr "" -#: app/models/create_enterprise.rb:11 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:101 msgid "Economic activity" msgstr "" -#: app/models/create_enterprise.rb:12 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:101 msgid "Management information" msgstr "" @@ -3467,15 +3474,15 @@ msgstr "" msgid " is inviting you to join \"\" on ." msgstr "" -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 msgid "Display name" msgstr "" -#: app/models/organization.rb:117 +#: app/models/organization.rb:119 msgid "Community's profile" msgstr "" -#: app/models/organization.rb:118 +#: app/models/organization.rb:120 msgid "Invite Friends" msgstr "" @@ -3573,9 +3580,9 @@ msgid "Activities short description" msgstr "" #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:12 -#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/shared/_organization_custom_fields.rhtml:15 #: app/views/profile_editor/_person_form.rhtml:22 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:13 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:19 msgid "ZIP code" msgstr "" @@ -4182,11 +4189,11 @@ msgstr "" msgid "Sign out of chat" msgstr "" -#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:12 +#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:20 msgid "No product" msgstr "" -#: app/helpers/display_helper.rb:59 +#: app/helpers/display_helper.rb:67 msgid "Are you sure you want to visit this web site?" msgstr "" @@ -4466,7 +4473,7 @@ msgstr "" msgid "Source: %s" msgstr "" -#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:17 +#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:39 #: app/views/search/_image.rhtml:43 app/views/cms/_text_editor_sidebar.rhtml:3 #: app/views/manage_products/_display_image.rhtml:6 msgid "Zoom in" @@ -4519,6 +4526,14 @@ msgstr "" msgid "Type in a search term" msgstr "" +#: app/helpers/application_helper.rb:1418 +msgid "The content here is available to %s's friends only." +msgstr "" + +#: app/helpers/application_helper.rb:1421 +msgid "The contents in this community is available to members only." +msgstr "" + #: app/helpers/events_helper.rb:4 msgid "Select a day on the left to display it's events here" msgstr "" @@ -4674,6 +4689,10 @@ msgstr "" msgid "Delete" msgstr "" +#: app/helpers/catalog_helper.rb:7 +msgid "Start" +msgstr "" + #: app/helpers/blog_helper.rb:10 msgid "New post" msgstr "" @@ -5358,49 +5377,57 @@ msgstr "" msgid "I want to receive a copy of the message in my e-mail." msgstr "" -#: app/views/catalog/index.rhtml:5 app/views/blocks/profile_info.rhtml:21 +#: app/views/catalog/index.rhtml:4 app/views/blocks/profile_info.rhtml:21 #: app/views/profile/_organization_profile.rhtml:26 msgid "Products/Services" msgstr "" -#: app/views/catalog/index.rhtml:20 app/views/search/_image.rhtml:35 +#: app/views/catalog/index.rhtml:16 +msgid "There are no sub-categories for %s" +msgstr "" + +#: app/views/catalog/index.rhtml:34 +msgid "Highlighted product" +msgstr "" + +#: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35 #: app/views/search/_image.rhtml:47 msgid "No image" msgstr "" -#: app/views/catalog/index.rhtml:30 +#: app/views/catalog/index.rhtml:52 msgid "from " msgstr "" -#: app/views/catalog/index.rhtml:31 +#: app/views/catalog/index.rhtml:53 msgid "by " msgstr "" -#: app/views/catalog/index.rhtml:37 +#: app/views/catalog/index.rhtml:59 msgid " / " msgstr "" -#: app/views/catalog/index.rhtml:45 +#: app/views/catalog/index.rhtml:67 msgid "description" msgstr "" -#: app/views/catalog/index.rhtml:55 +#: app/views/catalog/index.rhtml:77 msgid "price composition" msgstr "" -#: app/views/catalog/index.rhtml:78 +#: app/views/catalog/index.rhtml:100 msgid "inputs and raw materials" msgstr "" -#: app/views/catalog/index.rhtml:84 +#: app/views/catalog/index.rhtml:106 msgid "%{amount_used} %{unit} of" msgstr "" -#: app/views/catalog/index.rhtml:95 +#: app/views/catalog/index.rhtml:117 msgid "qualifiers" msgstr "" -#: app/views/catalog/index.rhtml:103 +#: app/views/catalog/index.rhtml:125 msgid "product unavailable" msgstr "" @@ -5480,7 +5507,7 @@ msgstr "" #: app/views/profile_editor/edit.rhtml:64 app/views/cms/view.rhtml:9 #: app/views/tasks/index.rhtml:37 app/views/tasks/index.rhtml:62 #: app/views/box_organizer/index.rhtml:5 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:43 msgid "Back to control panel" msgstr "" @@ -5642,7 +5669,7 @@ msgstr "" #: app/views/maps/edit_location.rhtml:13 #: app/views/shared/_organization_custom_fields.rhtml:12 #: app/views/profile_editor/_person_form.rhtml:23 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15 msgid "Address (street and number)" msgstr "" @@ -6071,22 +6098,18 @@ msgid "Supplier" msgstr "" #: app/views/search/index.rhtml:7 app/views/search/category_index.rhtml:7 -#: plugins/solr/views/solr_plugin_public/index.rhtml:7 msgid "Search Results" msgstr "" #: app/views/search/index.rhtml:14 app/views/search/category_index.rhtml:14 -#: plugins/solr/views/solr_plugin_public/index.rhtml:14 msgid "Sub-categories" msgstr "" #: app/views/search/index.rhtml:16 app/views/search/category_index.rhtml:16 -#: plugins/solr/views/solr_plugin_public/index.rhtml:16 msgid "No sub-categories" msgstr "" #: app/views/search/_facets_unselect_menu.rhtml:3 -#: plugins/solr/views/search/_facets_unselect_menu.rhtml:3 msgid "Applied filters" msgstr "" @@ -6948,7 +6971,7 @@ msgstr "" msgid "Home phone" msgstr "" -#: app/views/profile_editor/_person_form.rhtml:48 +#: app/views/profile_editor/_person_form.rhtml:50 msgid "Custom formation" msgstr "" @@ -9659,7 +9682,7 @@ msgid "[%s] Bsc management transferred to you." msgstr "" #: plugins/bsc/lib/bsc_plugin/contract.rb:33 -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Opened" msgstr "" @@ -9890,92 +9913,101 @@ msgstr "" msgid "The tolerance time for editing this content is over." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:10 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:13 msgid "Option updated successfully." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:12 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:15 msgid "Option wasn't updated successfully." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:98 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:116 msgid "Request sent successfully. Check your email." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:121 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:139 msgid "Basket displayed." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:140 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:158 msgid "Basket hidden." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:162 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:186 +msgid "Delivery option updated." +msgstr "" + +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:199 msgid "Can't join items from different enterprises." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:176 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:213 msgid "There is no basket." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:192 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:229 msgid "This enterprise doesn't have this product." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:206 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:243 msgid "The basket doesn't have this product." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:220 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:257 msgid "Invalid quantity." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:11 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:12 msgid "A shopping basket feature for enterprises" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:17 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:37 msgid "Add to basket" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:44 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:65 msgid "Shopping basket" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:47 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:68 msgid "Purchase reports" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:8 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:10 msgid "[%s] Your buy request was performed successfully." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:21 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:25 msgid "[%s] You have a new buy request from %s." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:22 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41 +msgid "Free delivery" +msgstr "" + +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7 msgid "Delivery" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:35 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53 msgid "Item name" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:52 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76 #: plugins/shopping_cart/views/cart.html.erb:9 msgid "Total:" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Canceled" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Confirmed" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Shipped" msgstr "" @@ -10777,6 +10809,25 @@ msgstr "" msgid "E-mail" msgstr "" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9 +msgid "Delivery option" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Payment" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 +msgid "Change" +msgstr "" + #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:1 msgid "Basket options" msgstr "" @@ -10785,8 +10836,26 @@ msgstr "" msgid "Delivery?" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:6 -msgid "Delivery price:" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +msgid "Option" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:24 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:32 +msgid "Remove option" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:27 +msgid "ADD NEW OPTION" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 +msgid "Free delivery price:" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 +msgid "Empty stands for no free delivery price." msgstr "" #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10 @@ -10812,16 +10881,28 @@ msgstr "" msgid "Phone number" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:37 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Money" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Check" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47 msgid "Here are the products you bought:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51 msgid "Thanks for buying with us!" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:45 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51 msgid "A service of %s." msgstr "" @@ -10833,23 +10914,23 @@ msgstr "" msgid "Below follows the customer informations:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45 msgid "And here are the items bought by this customer:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:40 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49 msgid "If there are any problems with this email contact the admin of %s." msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:14 msgid "Delivery Address" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:23 msgid "Send buy request" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/send_request.html.erb:1 +#: plugins/shopping_cart/views/shopping_cart_plugin/send_request.html.erb:1 msgid "Request sent successfully check your email." msgstr "" diff --git a/po/es/noosfero.po b/po/es/noosfero.po index 3dbe793..badd5fa 100644 --- a/po/es/noosfero.po +++ b/po/es/noosfero.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.39.1\n" -"POT-Creation-Date: 2013-01-03 20:39-0000\n" +"Project-Id-Version: noosfero 0.39.3\n" +"POT-Creation-Date: 2013-01-19 21:42-0000\n" "PO-Revision-Date: 2013-01-03 18:39-0300\n" "Last-Translator: Luis David Aguilar Carlos ,Freddy " "Martín Hernández Facio , Pedro Alonzo Ramírez Tovar is inviting you to join \"\" on ." msgstr " te esta invitando a unirte a \"\" en ." -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 msgid "Display name" msgstr "Mostrar nombre" -#: app/models/organization.rb:117 +#: app/models/organization.rb:119 msgid "Community's profile" msgstr "Perfil de la comunidad" -#: app/models/organization.rb:118 +#: app/models/organization.rb:120 msgid "Invite Friends" msgstr "Invitar Amigos" @@ -3727,9 +3738,9 @@ msgid "Activities short description" msgstr "Descripción corta de actividades" #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:12 -#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/shared/_organization_custom_fields.rhtml:15 #: app/views/profile_editor/_person_form.rhtml:22 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:13 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:19 msgid "ZIP code" msgstr "Código postal" @@ -4365,12 +4376,12 @@ msgstr "Ocupado" msgid "Sign out of chat" msgstr "Desconectado" -#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:12 +#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:20 msgid "No product" msgstr "Ningún producto" # Dudas acerca de usar idioma neutro o coloquial -#: app/helpers/display_helper.rb:59 +#: app/helpers/display_helper.rb:67 msgid "Are you sure you want to visit this web site?" msgstr "¿Esta seguro de querer visitar este sitio?" @@ -4649,7 +4660,7 @@ msgstr "hace %{distance} días" msgid "Source: %s" msgstr "Origen: %s" -#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:17 +#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:39 #: app/views/search/_image.rhtml:43 app/views/cms/_text_editor_sidebar.rhtml:3 #: app/views/manage_products/_display_image.rhtml:6 msgid "Zoom in" @@ -4703,6 +4714,15 @@ msgstr "" msgid "Type in a search term" msgstr "Ingresa un término de búsqueda" +#: app/helpers/application_helper.rb:1418 +msgid "The content here is available to %s's friends only." +msgstr "Este contenido está disponible solamente para amigos de %s." + +#: app/helpers/application_helper.rb:1421 +msgid "The contents in this community is available to members only." +msgstr "" +"El contenido en esta comunidad está disponible solamente para sus miembros." + #: app/helpers/events_helper.rb:4 msgid "Select a day on the left to display it's events here" msgstr "Seleccionar un día en la izquierda para visualizar los eventos" @@ -4860,6 +4880,11 @@ msgstr "Difunde ésto" msgid "Delete" msgstr "Borrar" +#: app/helpers/catalog_helper.rb:7 +#, fuzzy +msgid "Start" +msgstr "Fecha de inicio" + # sigue la duda sobre como traducir "post" #: app/helpers/blog_helper.rb:10 msgid "New post" @@ -5549,49 +5574,59 @@ msgstr "" msgid "I want to receive a copy of the message in my e-mail." msgstr "Quiero recibir una copia de este mensaje en mi correo electrónico." -#: app/views/catalog/index.rhtml:5 app/views/blocks/profile_info.rhtml:21 +#: app/views/catalog/index.rhtml:4 app/views/blocks/profile_info.rhtml:21 #: app/views/profile/_organization_profile.rhtml:26 msgid "Products/Services" msgstr "Productos/Servicios" -#: app/views/catalog/index.rhtml:20 app/views/search/_image.rhtml:35 +#: app/views/catalog/index.rhtml:16 +#, fuzzy +msgid "There are no sub-categories for %s" +msgstr "No existe tal página: %s" + +#: app/views/catalog/index.rhtml:34 +#, fuzzy +msgid "Highlighted product" +msgstr "Destacar este producto" + +#: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35 #: app/views/search/_image.rhtml:47 msgid "No image" msgstr "Sin imagen" -#: app/views/catalog/index.rhtml:30 +#: app/views/catalog/index.rhtml:52 msgid "from " msgstr "desde" -#: app/views/catalog/index.rhtml:31 +#: app/views/catalog/index.rhtml:53 msgid "by " msgstr "por " -#: app/views/catalog/index.rhtml:37 +#: app/views/catalog/index.rhtml:59 msgid " / " msgstr " / " -#: app/views/catalog/index.rhtml:45 +#: app/views/catalog/index.rhtml:67 msgid "description" msgstr "descripción" -#: app/views/catalog/index.rhtml:55 +#: app/views/catalog/index.rhtml:77 msgid "price composition" msgstr "composición del precio" -#: app/views/catalog/index.rhtml:78 +#: app/views/catalog/index.rhtml:100 msgid "inputs and raw materials" msgstr "entradas y material" -#: app/views/catalog/index.rhtml:84 +#: app/views/catalog/index.rhtml:106 msgid "%{amount_used} %{unit} of" msgstr "%{amount_used} %{unit} de" -#: app/views/catalog/index.rhtml:95 +#: app/views/catalog/index.rhtml:117 msgid "qualifiers" msgstr "calificadores" -#: app/views/catalog/index.rhtml:103 +#: app/views/catalog/index.rhtml:125 msgid "product unavailable" msgstr "producto no disponible" @@ -5681,7 +5716,7 @@ msgstr "Administrar %s" #: app/views/profile_editor/edit.rhtml:64 app/views/cms/view.rhtml:9 #: app/views/tasks/index.rhtml:37 app/views/tasks/index.rhtml:62 #: app/views/box_organizer/index.rhtml:5 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:43 msgid "Back to control panel" msgstr "Volver al panel de control" @@ -5850,7 +5885,7 @@ msgstr "Ubicación:" #: app/views/maps/edit_location.rhtml:13 #: app/views/shared/_organization_custom_fields.rhtml:12 #: app/views/profile_editor/_person_form.rhtml:23 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15 msgid "Address (street and number)" msgstr "Dirección (calle y número)" @@ -6295,22 +6330,18 @@ msgid "Supplier" msgstr "Proveedor" #: app/views/search/index.rhtml:7 app/views/search/category_index.rhtml:7 -#: plugins/solr/views/solr_plugin_public/index.rhtml:7 msgid "Search Results" msgstr "Buscar resultados" #: app/views/search/index.rhtml:14 app/views/search/category_index.rhtml:14 -#: plugins/solr/views/solr_plugin_public/index.rhtml:14 msgid "Sub-categories" msgstr "Sub-categorías" #: app/views/search/index.rhtml:16 app/views/search/category_index.rhtml:16 -#: plugins/solr/views/solr_plugin_public/index.rhtml:16 msgid "No sub-categories" msgstr "Sin sub-categorías" #: app/views/search/_facets_unselect_menu.rhtml:3 -#: plugins/solr/views/search/_facets_unselect_menu.rhtml:3 msgid "Applied filters" msgstr "Filtros aplicados" @@ -7259,7 +7290,7 @@ msgstr "" msgid "Home phone" msgstr "Teléfono de casa" -#: app/views/profile_editor/_person_form.rhtml:48 +#: app/views/profile_editor/_person_form.rhtml:50 msgid "Custom formation" msgstr "Formación perzonalizada" @@ -9314,11 +9345,9 @@ msgid "" msgstr "Bienvenido, %s" #: app/views/layouts/application-ng.rhtml:68 -#, fuzzy msgid "or " msgstr "" -" or %s" +"o " #: app/views/layouts/application-ng.rhtml:68 msgid "Sign up" @@ -10117,7 +10146,7 @@ msgid "[%s] Bsc management transferred to you." msgstr "[%s] administración de bsc transferida a ti" #: plugins/bsc/lib/bsc_plugin/contract.rb:33 -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Opened" msgstr "Abierto" @@ -10376,92 +10405,103 @@ msgstr "" msgid "The tolerance time for editing this content is over." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:10 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:13 msgid "Option updated successfully." msgstr "Opción actualizada correctamente." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:12 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:15 msgid "Option wasn't updated successfully." msgstr "La opción no fue actualizada satisfactoriamente." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:98 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:116 msgid "Request sent successfully. Check your email." msgstr "Solicitud enviada satisfactoriamente. Revisa tu correo electrónico." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:121 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:139 msgid "Basket displayed." msgstr "Carrito mostrado." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:140 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:158 msgid "Basket hidden." msgstr "Carrito oculto." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:162 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:186 +#, fuzzy +msgid "Delivery option updated." +msgstr "Precio de entrega" + +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:199 msgid "Can't join items from different enterprises." msgstr "No puedes unir elementos de diferentes empresas." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:176 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:213 msgid "There is no basket." msgstr "No hay carrito." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:192 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:229 msgid "This enterprise doesn't have this product." msgstr "Esta empresa no tiene este producto." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:206 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:243 msgid "The basket doesn't have this product." msgstr "El carrito no tiene este producto." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:220 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:257 msgid "Invalid quantity." msgstr "Cantidad no válida." -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:11 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:12 msgid "A shopping basket feature for enterprises" msgstr "Una característica de carrito de compras para tu empresa" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:17 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:37 msgid "Add to basket" msgstr "Añadir al carrito" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:44 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:65 msgid "Shopping basket" msgstr "Carrito de compras" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:47 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:68 msgid "Purchase reports" msgstr "Reportes de compras" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:8 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:10 msgid "[%s] Your buy request was performed successfully." msgstr "[%s] Tu solicitud de compra se realizó con exito." -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:21 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:25 msgid "[%s] You have a new buy request from %s." msgstr "[%s] Tienes una nueva solicitud de compra de %s." -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:22 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41 +#, fuzzy +msgid "Free delivery" +msgstr "Entrega" + +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7 msgid "Delivery" msgstr "Entrega" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:35 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53 msgid "Item name" msgstr "Nombre de artículo" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:52 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76 #: plugins/shopping_cart/views/cart.html.erb:9 msgid "Total:" msgstr "Total:" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Canceled" msgstr "Cancelado" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Confirmed" msgstr "Confirmado" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Shipped" msgstr "Transportado" @@ -11327,6 +11367,27 @@ msgstr "Valor de compra" msgid "E-mail" msgstr "Correo electrónico" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9 +#, fuzzy +msgid "Delivery option" +msgstr "Precio de entrega" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Payment" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 +#, fuzzy +msgid "Change" +msgstr "Cambiar imagen" + #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:1 msgid "Basket options" msgstr "Opciones de carrito" @@ -11335,10 +11396,30 @@ msgstr "Opciones de carrito" msgid "Delivery?" msgstr "¿Entrega?" -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:6 -msgid "Delivery price:" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +msgid "Option" +msgstr "Opción" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:24 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:32 +#, fuzzy +msgid "Remove option" +msgstr "Más opciones" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:27 +msgid "ADD NEW OPTION" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 +#, fuzzy +msgid "Free delivery price:" msgstr "Precio de entrega" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 +msgid "Empty stands for no free delivery price." +msgstr "" + #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10 msgid "This is a notification e-mail about your buy request on %s." msgstr "" @@ -11366,16 +11447,29 @@ msgstr "Por favor revisa si tu información debajo es correcta:" msgid "Phone number" msgstr "Número de teléfono" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:37 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Money" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +#, fuzzy +msgid "Check" +msgstr "Marcar todos" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47 msgid "Here are the products you bought:" msgstr "Aquí estan los productos que compraste:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51 msgid "Thanks for buying with us!" msgstr "¡Gracias por comprar con nosotros!" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:45 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51 msgid "A service of %s." msgstr "Un servicio de %s." @@ -11387,25 +11481,25 @@ msgstr "Esta es una solicitud de compra hecha por %s." msgid "Below follows the customer informations:" msgstr "A continuación sigue la información de los clientes:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45 msgid "And here are the items bought by this customer:" msgstr "Y aquí son los elementos comprados por este cliente:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:40 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49 msgid "If there are any problems with this email contact the admin of %s." msgstr "" "Si hay algún problema con este correo electrónico ponte en contacto con el " "administrador de %s. " -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:14 msgid "Delivery Address" msgstr "Dirección de entrega" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:23 msgid "Send buy request" msgstr "Enviar solicitud de compra" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/send_request.html.erb:1 +#: plugins/shopping_cart/views/shopping_cart_plugin/send_request.html.erb:1 msgid "Request sent successfully check your email." msgstr "Solicitud enviada con éxito revisa tu correo electrónico." @@ -11538,9 +11632,6 @@ msgstr "" #~ msgid "Remove this comment and all its replies" #~ msgstr "Eliminar este comentario y todas sus respuestas" -#~ msgid "Option" -#~ msgstr "Opción" - #~ msgid "signup|Login" #~ msgstr "Nombre de usuario" diff --git a/po/fr/noosfero.po b/po/fr/noosfero.po index bc1e942..63182b3 100644 --- a/po/fr/noosfero.po +++ b/po/fr/noosfero.po @@ -4,9 +4,9 @@ # , 2009. msgid "" msgstr "" -"Project-Id-Version: noosfero 0.39.1\n" +"Project-Id-Version: noosfero 0.39.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-03 20:39-0000\n" +"POT-Creation-Date: 2013-01-19 21:42-0000\n" "PO-Revision-Date: 2009-12-04 18:46-0300\n" "Last-Translator: Jean-Claude Bulliard \n" "Language-Team: American English \n" @@ -26,35 +26,39 @@ msgstr "Votre invitation a été envoyée." msgid "Please enter a valid email address." msgstr "Entrez une adresse e-mail valide SVP." -#: app/controllers/public/content_viewer_controller.rb:38 -msgid "" -"You are not allowed to view this content. You can contact the owner of this " -"profile to request access then." +#: app/controllers/public/content_viewer_controller.rb:35 +#, fuzzy +msgid "You are not allowed to view this content." +msgstr "Vous n'êtes pas autorisé(e) à voir cette page." + +#: app/controllers/public/content_viewer_controller.rb:36 +#, fuzzy +msgid "You can contact the owner of this profile to request access then." msgstr "" "Vous n'êtes pas autorisé(e) à voir ce contenu. Vous pouvez contacter son " "propriétaire pour lui en demander l'accès. " -#: app/controllers/public/content_viewer_controller.rb:114 +#: app/controllers/public/content_viewer_controller.rb:116 #, fuzzy msgid "Notification of new comments to '%s' was successfully canceled" msgstr "Le produit a bien été ôté" -#: app/controllers/public/content_viewer_controller.rb:135 +#: app/controllers/public/content_viewer_controller.rb:137 #, fuzzy msgid "Comment succesfully updated" msgstr "Le commentaire a bien été effacé" -#: app/controllers/public/content_viewer_controller.rb:138 +#: app/controllers/public/content_viewer_controller.rb:140 #, fuzzy msgid "Comment could not be updated" msgstr "Ce fichier n'a pas pu être sauvegardé" -#: app/controllers/public/content_viewer_controller.rb:143 +#: app/controllers/public/content_viewer_controller.rb:145 #, fuzzy msgid "Could not find the comment in the article" msgstr "Impossible de mettre à jour l'entreprise" -#: app/controllers/public/content_viewer_controller.rb:157 +#: app/controllers/public/content_viewer_controller.rb:159 #: app/controllers/my_profile/cms_controller.rb:264 msgid "Please type the words correctly" msgstr "" @@ -67,7 +71,6 @@ msgstr "profil de catégories" #: app/controllers/public/search_controller.rb:151 #: app/models/people_block.rb:4 app/helpers/application_helper.rb:1097 #: app/helpers/assets_helper.rb:8 app/helpers/search_helper.rb:13 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:34 msgid "People" msgstr "Personnes" @@ -75,7 +78,6 @@ msgstr "Personnes" #: app/models/enterprises_block.rb:12 app/helpers/assets_helper.rb:10 #: app/helpers/search_helper.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/profile/_person_profile.rhtml:23 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:35 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:13 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:18 msgid "Enterprises" @@ -85,13 +87,11 @@ msgstr "Entreprises" #: app/models/products_block.rb:8 app/models/products_block.rb:12 #: app/models/enterprise.rb:130 app/helpers/application_helper.rb:539 #: app/helpers/assets_helper.rb:9 app/views/search/_sellers_form.rhtml:8 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:36 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:22 msgid "Products" msgstr "Produits" #: app/controllers/public/search_controller.rb:154 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:37 msgid "Upcoming events" msgstr "Événements à venir" @@ -99,13 +99,11 @@ msgstr "Événements à venir" #: app/models/communities_block.rb:4 app/helpers/application_helper.rb:524 #: app/helpers/application_helper.rb:1113 app/helpers/assets_helper.rb:11 #: app/helpers/search_helper.rb:14 app/views/profile/_person_profile.rhtml:41 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:38 msgid "Communities" msgstr "Groupes" #: app/controllers/public/search_controller.rb:156 #: app/helpers/application_helper.rb:1081 app/helpers/search_helper.rb:11 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:39 #, fuzzy msgid "Contents" msgstr "Type de contenu" @@ -271,21 +269,13 @@ msgstr "Votre invitation a été envoyée." msgid "Could not create the e-mail" msgstr "Impossible de créer le matériau brut" -#: app/controllers/public/profile_controller.rb:373 -msgid "The content here is available to %s's friends only." -msgstr "" - #: app/controllers/public/profile_controller.rb:376 -msgid "The contents in this community is available to members only." -msgstr "" - -#: app/controllers/public/profile_controller.rb:383 msgid "" "This profile is inaccessible. You don't have the permission to view the " "content here." msgstr "" -#: app/controllers/public/profile_controller.rb:383 +#: app/controllers/public/profile_controller.rb:376 msgid "Oops ... you cannot go ahead here" msgstr "" @@ -550,7 +540,7 @@ msgstr "Page non trouvée" #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:23 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:6 msgid "Name" msgstr "Nom" @@ -804,7 +794,7 @@ msgstr "" msgid "profile" msgstr "profil" -#: app/models/product.rb:- app/models/article.rb:702 app/models/mailing.rb:- +#: app/models/product.rb:- app/models/article.rb:706 app/models/mailing.rb:- #: app/views/cms/view.rhtml:25 #: app/views/shared/reported_versions/_article.html.erb:3 #: app/views/shared/reported_versions/_comment.html.erb:3 @@ -844,15 +834,15 @@ msgstr "Actif" #: app/views/box_organizer/_link_list_block.rhtml:4 #: plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb:12 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:19 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:25 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:23 msgid "Address" msgstr "Adresse" #: app/models/product.rb:- app/models/create_enterprise.rb:6 #: app/views/profile_editor/_person_form.rhtml:13 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:8 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:8 msgid "Contact phone" msgstr "Téléphone de contact" @@ -902,7 +892,7 @@ msgstr "Pied de page sur-mesure" msgid "Theme" msgstr "Thème " -#: app/models/product.rb:- app/models/profile.rb:715 +#: app/models/product.rb:- app/models/profile.rb:723 msgid "Public profile" msgstr "Profil public" @@ -1017,7 +1007,7 @@ msgid "Abstract" msgstr "Résumé" #: app/models/product.rb:- app/models/action_tracker_notification.rb:- -#: app/models/article.rb:706 app/models/person.rb:263 app/models/profile.rb:9 +#: app/models/article.rb:710 app/models/person.rb:266 app/models/profile.rb:9 #: app/models/profile_categorization.rb:- app/views/profile/index.rhtml:28 #: app/views/profile/index.rhtml:33 msgid "Profile" @@ -1214,7 +1204,7 @@ msgstr "Événement" msgid "environment" msgstr "environnement" -#: app/models/product.rb:- app/models/organization.rb:99 +#: app/models/product.rb:- app/models/organization.rb:101 #: app/views/admin_panel/_site_info.rhtml:2 msgid "Contact email" msgstr "Adresse électronique de contact" @@ -1282,12 +1272,13 @@ msgstr "Catégorie du produit" #: app/models/product.rb:- app/models/price_detail.rb:- #: app/views/manage_products/index.rhtml:6 -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:37 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:55 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 msgid "Price" msgstr "Prix" #: app/models/product.rb:- app/models/certifier.rb:- -#: app/models/organization.rb:99 app/views/search/_product.rhtml:52 +#: app/models/organization.rb:101 app/views/search/_product.rhtml:52 #: app/views/search/_article_description.rhtml:4 #: app/views/profile_editor/_person_form.rhtml:10 #: app/views/cms/_uploaded_file.rhtml:5 @@ -1362,7 +1353,7 @@ msgstr "Auteur" #: app/views/cms/suggest_an_article.rhtml:17 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:18 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:16 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:7 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:7 msgid "Email" msgstr "Adresse électronique" @@ -1467,7 +1458,7 @@ msgid "Accept products" msgstr "Voir tous les produits" #: app/models/product.rb:- app/models/create_enterprise.rb:8 -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 #: app/views/enterprise_validation/_details.rhtml:19 msgid "Acronym" msgstr "Sigle" @@ -1495,52 +1486,52 @@ msgstr "Position" msgid "Fetched at" msgstr "Créé le" -#: app/models/product.rb:76 app/helpers/display_helper.rb:34 -#: app/helpers/display_helper.rb:43 +#: app/models/product.rb:80 app/helpers/display_helper.rb:42 +#: app/helpers/display_helper.rb:51 msgid "Uncategorized product" msgstr "Produit sans catégorie" -#: app/models/product.rb:206 +#: app/models/product.rb:210 msgid "0%" msgstr "" -#: app/models/product.rb:207 +#: app/models/product.rb:211 msgid "25%" msgstr "" -#: app/models/product.rb:208 +#: app/models/product.rb:212 msgid "50%" msgstr "" -#: app/models/product.rb:209 +#: app/models/product.rb:213 msgid "75%" msgstr "" -#: app/models/product.rb:210 +#: app/models/product.rb:214 msgid "100%" msgstr "" -#: app/models/product.rb:234 +#: app/models/product.rb:238 msgid " cert. " msgstr "" -#: app/models/product.rb:259 +#: app/models/product.rb:263 #, fuzzy msgid "Related products" msgstr "Voir tous les produits" -#: app/models/product.rb:260 app/models/contact.rb:- app/models/person.rb:204 -#: app/models/profile.rb:942 app/models/enterprise.rb:23 +#: app/models/product.rb:264 app/models/contact.rb:- app/models/person.rb:207 +#: app/models/profile.rb:950 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:11 app/views/search/_product.rhtml:59 #: app/views/search/_profile.rhtml:21 #: app/views/profile_editor/_person_form.rhtml:21 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:10 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:12 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:18 msgid "City" msgstr "Ville" -#: app/models/product.rb:261 app/views/search/_product.rhtml:65 +#: app/models/product.rb:265 app/views/search/_product.rhtml:65 #, fuzzy msgid "Qualifiers" msgstr "Qualité" @@ -1608,7 +1599,7 @@ msgstr "Nouveau %s" #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:16 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:52 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:42 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:25 msgid "Save" msgstr "Enregistrer" @@ -1706,7 +1697,6 @@ msgstr "Rouge" #: app/views/search/_search_form.rhtml:24 #: app/views/cms/_text_editor_sidebar.rhtml:36 app/views/home/index.rhtml:61 #: app/views/profile_members/_add_admins.rhtml:5 -#: plugins/solr/views/search/_search_form.rhtml:24 msgid "Search" msgstr "Chercher" @@ -1937,7 +1927,7 @@ msgstr "Sujet" msgid "Message" msgstr "Message" -#: app/models/contact.rb:- app/models/person.rb:204 +#: app/models/contact.rb:- app/models/person.rb:207 #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:10 #: app/views/profile_editor/_person_form.rhtml:20 #: plugins/bsc/lib/bsc_plugin/contract.rb:46 @@ -1971,11 +1961,11 @@ msgstr "Pour ôter %s" msgid "(unauthenticated user)" msgstr "(utilisateur inconnu)" -#: app/models/comment.rb:179 +#: app/models/comment.rb:183 msgid "[%s] you got a new comment!" msgstr "[%s] vous avez un nouveau commentaire !" -#: app/models/comment.rb:194 +#: app/models/comment.rb:198 #, fuzzy msgid "[%s] %s commented on a content of %s" msgstr "Articles les plus commentés" @@ -2081,7 +2071,7 @@ msgstr "" msgid "cyclical reference is not allowed." msgstr "" -#: app/models/article.rb:170 app/models/organization.rb:99 +#: app/models/article.rb:170 app/models/organization.rb:101 msgid "Tag list" msgstr "Liste de tags" @@ -2111,66 +2101,66 @@ msgstr "" msgid "Unknown" msgstr "Utilisateur inconnu" -#: app/models/article.rb:605 +#: app/models/article.rb:609 #, fuzzy msgid "no comments" msgstr "Un commentaire" -#: app/models/article.rb:606 +#: app/models/article.rb:610 #, fuzzy msgid "one comment" msgstr "Un commentaire" -#: app/models/article.rb:607 +#: app/models/article.rb:611 #, fuzzy msgid "%s comments" msgstr "Poster votre commentaire" -#: app/models/article.rb:614 +#: app/models/article.rb:618 msgid "no views" msgstr "" -#: app/models/article.rb:615 +#: app/models/article.rb:619 #, fuzzy msgid "one view" msgstr "Tout le site" -#: app/models/article.rb:616 +#: app/models/article.rb:620 msgid "%s views" msgstr "" -#: app/models/article.rb:621 +#: app/models/article.rb:625 #, fuzzy msgid "Created at: " msgstr "Créé le" -#: app/models/article.rb:703 +#: app/models/article.rb:707 #, fuzzy msgid "Published date" msgstr "Publié" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Older than one year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 #, fuzzy msgid "In the last year" msgstr "Retour à la galerie" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last month" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last week" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last day" msgstr "" -#: app/models/article.rb:707 app/helpers/application_helper.rb:614 +#: app/models/article.rb:711 app/helpers/application_helper.rb:614 #: app/views/search/_article_categories.rhtml:2 #: app/views/categories/index.rhtml:1 app/views/admin_panel/index.rhtml:41 #: app/views/content_viewer/view_page.rhtml:77 @@ -2486,16 +2476,21 @@ msgstr "" msgid "Redirects the user to his control panel." msgstr "Retourner au panneau de contrôle." -#: app/models/environment.rb:579 +#: app/models/environment.rb:238 +#, fuzzy +msgid "This enterprise needs to be enabled." +msgstr "Votre entreprise a été bloquée" + +#: app/models/environment.rb:580 msgid "Only one Virtual Community can be the default one" msgstr "Seule une CoVi peut être celle par défaut" -#: app/models/environment.rb:842 +#: app/models/environment.rb:843 #, fuzzy msgid "is not available." msgstr "Indisponible" -#: app/models/environment.rb:850 +#: app/models/environment.rb:851 msgid "have unsupported languages." msgstr "" @@ -2749,9 +2744,9 @@ msgstr "Flux extérieur" msgid "Feed title" msgstr "Échec dans l'édition du rôle" -#: app/models/external_feed.rb:- app/models/person.rb:266 -#: app/models/person.rb:277 app/models/organization.rb:121 -#: app/models/organization.rb:132 app/models/blog.rb:13 app/models/blog.rb:17 +#: app/models/external_feed.rb:- app/models/person.rb:269 +#: app/models/person.rb:280 app/models/organization.rb:123 +#: app/models/organization.rb:134 app/models/blog.rb:13 app/models/blog.rb:17 #: app/models/enterprise.rb:129 app/models/enterprise.rb:145 msgid "Blog" msgstr "Blog" @@ -2875,8 +2870,8 @@ msgstr "Méthodologie de validation" msgid "Restrictions" msgstr "Restrictions" -#: app/models/validation_info.rb:- app/models/person.rb:195 -#: app/views/profile_editor/_person_form.rhtml:60 +#: app/models/validation_info.rb:- app/models/person.rb:198 +#: app/views/profile_editor/_person_form.rhtml:62 msgid "Organization" msgstr "Organisation" @@ -2915,114 +2910,131 @@ msgstr "école" msgid "family" msgstr "famille" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:14 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:14 msgid "Cell phone" msgstr "Téléphone mobile" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:15 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:15 msgid "Comercial phone" msgstr "Téléphone professionnel" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:18 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:18 msgid "Nationality" msgstr "Nationalité" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:27 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:29 msgid "Schooling" msgstr "Éducation" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:52 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:54 msgid "Area of study" msgstr "Domaine d'étude" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:59 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:61 msgid "Professional activity" msgstr "Activité professionnelle" -#: app/models/person.rb:195 app/models/enterprise.rb:23 -#: app/views/profile_editor/_person_form.rhtml:61 +#: app/models/person.rb:198 app/models/enterprise.rb:23 +#: app/views/profile_editor/_person_form.rhtml:63 msgid "Organization website" msgstr "Site d'organisation" -#: app/models/person.rb:198 +#: app/models/person.rb:201 msgid "Schooling status" msgstr "Statut de formation" -#: app/models/person.rb:201 app/helpers/profile_editor_helper.rb:26 -#: app/views/profile_editor/_person_form.rhtml:45 +#: app/models/person.rb:204 app/helpers/profile_editor_helper.rb:26 +#: app/views/profile_editor/_person_form.rhtml:47 msgid "Education" msgstr "Éducation" -#: app/models/person.rb:201 +#: app/models/person.rb:204 #, fuzzy msgid "Custom education" msgstr "Formation (autre)" -#: app/models/person.rb:201 app/views/profile_editor/_person_form.rhtml:55 +#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:57 msgid "Custom area of study" msgstr "Domaine d'étude (autre)" -#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:12 +#: app/models/person.rb:207 app/views/profile_editor/_person_form.rhtml:12 msgid "Contact information" msgstr "Informations de contact" -#: app/models/person.rb:204 app/models/enterprise.rb:23 +#: app/models/person.rb:207 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:9 -#: app/views/shared/_organization_custom_fields.rhtml:16 +#: app/views/shared/_organization_custom_fields.rhtml:18 #: app/views/profile_editor/_person_form.rhtml:19 #: plugins/bsc/views/shared/_fields.html.erb:65 msgid "Country" msgstr "Pays" -#: app/models/person.rb:204 +#: app/models/person.rb:207 msgid "Sex" msgstr "Sexe" -#: app/models/person.rb:204 +#: app/models/person.rb:207 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 msgid "Zip code" msgstr "Code postal" -#: app/models/person.rb:235 +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:14 +#: app/views/profile_editor/_person_form.rhtml:25 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17 +#, fuzzy +msgid "District" +msgstr "Restrictions" + +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/profile_editor/_person_form.rhtml:24 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16 +#, fuzzy +msgid "Address reference" +msgstr "Adresse :" + +#: app/models/person.rb:238 msgid "%{fn} is already used by other user" msgstr "%{fn} est déjà utilisé par un autre utilisateur." -#: app/models/person.rb:264 app/models/organization.rb:120 +#: app/models/person.rb:267 app/models/organization.rb:122 msgid "Image gallery" msgstr "Galerie d'images" -#: app/models/person.rb:265 app/models/organization.rb:119 +#: app/models/person.rb:268 app/models/organization.rb:121 #: app/helpers/application_helper.rb:532 app/helpers/application_helper.rb:541 #, fuzzy msgid "Agenda" msgstr "Envoyer" -#: app/models/person.rb:278 app/models/gallery.rb:4 app/models/gallery.rb:8 -#: app/models/organization.rb:133 app/views/search/_uploaded_file.rhtml:14 +#: app/models/person.rb:281 app/models/gallery.rb:4 app/models/gallery.rb:8 +#: app/models/organization.rb:135 app/views/search/_uploaded_file.rhtml:14 #, fuzzy msgid "Gallery" msgstr "Galerie d'images" -#: app/models/person.rb:390 +#: app/models/person.rb:393 #, fuzzy msgid "none" msgstr "Aucun(e)" -#: app/models/person.rb:391 +#: app/models/person.rb:394 #, fuzzy msgid "one friend" msgstr "Un contact" -#: app/models/person.rb:392 +#: app/models/person.rb:395 #, fuzzy msgid "%s friends" msgstr "Les contacts de %s" -#: app/models/person.rb:427 +#: app/models/person.rb:430 msgid "You just left %s." msgstr "" -#: app/models/person.rb:451 app/models/profile.rb:868 +#: app/models/person.rb:454 app/models/profile.rb:876 msgid "Edit Profile" msgstr "Éditer le profil" @@ -3119,76 +3131,76 @@ msgstr "Un membre" msgid "Send e-Mail to members" msgstr "Montrer le site à tous les membres" -#: app/models/profile.rb:301 +#: app/models/profile.rb:305 #, fuzzy msgid "is not a template." msgstr "Impossible de mettre à jour le modèle" -#: app/models/profile.rb:613 +#: app/models/profile.rb:621 #, fuzzy msgid "%s can't have members" msgstr "%s ne peut pas avoir de membres" -#: app/models/profile.rb:634 +#: app/models/profile.rb:642 msgid "%s can't has moderators" msgstr "%s ne peut pas avoir de modérateur" -#: app/models/profile.rb:715 +#: app/models/profile.rb:723 #, fuzzy msgid "Private profile" msgstr "Éditer le profil" -#: app/models/profile.rb:812 +#: app/models/profile.rb:820 #, fuzzy msgid "Since: " msgstr "Prix :" -#: app/models/profile.rb:827 +#: app/models/profile.rb:835 #, fuzzy msgid "no activity" msgstr "Activité économique" -#: app/models/profile.rb:828 +#: app/models/profile.rb:836 #, fuzzy msgid "one activity" msgstr "Activité économique" -#: app/models/profile.rb:829 +#: app/models/profile.rb:837 #, fuzzy msgid "%s activities" msgstr "Activité professionnelle" -#: app/models/profile.rb:835 +#: app/models/profile.rb:843 #, fuzzy msgid "no members" msgstr "Un membre" -#: app/models/profile.rb:836 +#: app/models/profile.rb:844 #, fuzzy msgid "one member" msgstr "Un membre" -#: app/models/profile.rb:837 +#: app/models/profile.rb:845 #, fuzzy msgid "%s members" msgstr "Les membres de %s" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 #, fuzzy msgid "facets|Enabled" msgstr "Profile|Activé" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 #, fuzzy msgid "facets|Not enabled" msgstr "%s n'était pas activé(e)" -#: app/models/profile.rb:940 +#: app/models/profile.rb:948 #, fuzzy msgid "Situation" msgstr "Message d'invitation :" -#: app/models/profile.rb:970 +#: app/models/profile.rb:978 #, fuzzy msgid "Profile Info and settings" msgstr "Informations et paramètres" @@ -3234,7 +3246,7 @@ msgstr "Qualité" msgid "Certifier" msgstr "Identifiant" -#: app/models/unit.rb:- app/views/catalog/index.rhtml:37 +#: app/models/unit.rb:- app/views/catalog/index.rhtml:59 #, fuzzy msgid "unit" msgstr "Groupe" @@ -3682,23 +3694,23 @@ msgstr "profil de catégories" msgid "profilecategorization" msgstr "categorisationdeprofils" -#: app/models/create_enterprise.rb:7 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:101 msgid "Contact person" msgstr "Personne de contact" -#: app/models/create_enterprise.rb:9 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:101 msgid "Foundation year" msgstr "Année de création" -#: app/models/create_enterprise.rb:10 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:101 msgid "Legal form" msgstr "Forme juridique" -#: app/models/create_enterprise.rb:11 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:101 msgid "Economic activity" msgstr "Activité économique" -#: app/models/create_enterprise.rb:12 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:101 msgid "Management information" msgstr "Information sur les dirigeants" @@ -3840,16 +3852,16 @@ msgstr "%s veut être membre de %s." msgid " is inviting you to join \"\" on ." msgstr " vous invite à participer à %{environment}." -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 msgid "Display name" msgstr "Afficher le nom" -#: app/models/organization.rb:117 +#: app/models/organization.rb:119 #, fuzzy msgid "Community's profile" msgstr "Templates de groupe" -#: app/models/organization.rb:118 +#: app/models/organization.rb:120 #, fuzzy msgid "Invite Friends" msgstr "Inviter mes contacts !" @@ -3955,9 +3967,9 @@ msgid "Activities short description" msgstr "Description courte des activités" #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:12 -#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/shared/_organization_custom_fields.rhtml:15 #: app/views/profile_editor/_person_form.rhtml:22 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:13 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:19 msgid "ZIP code" msgstr "Code postal" @@ -4634,11 +4646,11 @@ msgstr "" msgid "Sign out of chat" msgstr "" -#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:12 +#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:20 msgid "No product" msgstr "Pas de produit" -#: app/helpers/display_helper.rb:59 +#: app/helpers/display_helper.rb:67 msgid "Are you sure you want to visit this web site?" msgstr "Êtes-vous sûr(e) de vouloir visiter ce site web ?" @@ -4947,7 +4959,7 @@ msgstr "Distance :" msgid "Source: %s" msgstr "Prix : %s" -#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:17 +#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:39 #: app/views/search/_image.rhtml:43 app/views/cms/_text_editor_sidebar.rhtml:3 #: app/views/manage_products/_display_image.rhtml:6 #, fuzzy @@ -5006,6 +5018,14 @@ msgstr "" msgid "Type in a search term" msgstr "Désactiver la recherche d'entreprises" +#: app/helpers/application_helper.rb:1418 +msgid "The content here is available to %s's friends only." +msgstr "" + +#: app/helpers/application_helper.rb:1421 +msgid "The contents in this community is available to members only." +msgstr "" + #: app/helpers/events_helper.rb:4 msgid "Select a day on the left to display it's events here" msgstr "" @@ -5164,6 +5184,11 @@ msgstr "Partager " msgid "Delete" msgstr "Détruire" +#: app/helpers/catalog_helper.rb:7 +#, fuzzy +msgid "Start" +msgstr "Date de début" + #: app/helpers/blog_helper.rb:10 msgid "New post" msgstr "Nouvel article" @@ -5875,55 +5900,65 @@ msgstr "" msgid "I want to receive a copy of the message in my e-mail." msgstr "Recevoir une copie du message par mél" -#: app/views/catalog/index.rhtml:5 app/views/blocks/profile_info.rhtml:21 +#: app/views/catalog/index.rhtml:4 app/views/blocks/profile_info.rhtml:21 #: app/views/profile/_organization_profile.rhtml:26 msgid "Products/Services" msgstr "Produits/services" -#: app/views/catalog/index.rhtml:20 app/views/search/_image.rhtml:35 +#: app/views/catalog/index.rhtml:16 +#, fuzzy +msgid "There are no sub-categories for %s" +msgstr "Il n'y a pas de catégorie." + +#: app/views/catalog/index.rhtml:34 +#, fuzzy +msgid "Highlighted product" +msgstr "Limite d'articles" + +#: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35 #: app/views/search/_image.rhtml:47 #, fuzzy msgid "No image" msgstr "image" -#: app/views/catalog/index.rhtml:30 +#: app/views/catalog/index.rhtml:52 msgid "from " msgstr "" -#: app/views/catalog/index.rhtml:31 +#: app/views/catalog/index.rhtml:53 #, fuzzy msgid "by " msgstr "par %s" -#: app/views/catalog/index.rhtml:37 +#: app/views/catalog/index.rhtml:59 msgid " / " msgstr "" -#: app/views/catalog/index.rhtml:45 +#: app/views/catalog/index.rhtml:67 #, fuzzy msgid "description" msgstr "Description" -#: app/views/catalog/index.rhtml:55 +#: app/views/catalog/index.rhtml:77 #, fuzzy msgid "price composition" msgstr "Options de confidentialité" -#: app/views/catalog/index.rhtml:78 +#: app/views/catalog/index.rhtml:100 #, fuzzy msgid "inputs and raw materials" msgstr "Ajouter du matériau brut" -#: app/views/catalog/index.rhtml:84 +#: app/views/catalog/index.rhtml:106 msgid "%{amount_used} %{unit} of" msgstr "" -#: app/views/catalog/index.rhtml:95 +#: app/views/catalog/index.rhtml:117 #, fuzzy msgid "qualifiers" msgstr "Qualité" -#: app/views/catalog/index.rhtml:103 +#: app/views/catalog/index.rhtml:125 #, fuzzy msgid "product unavailable" msgstr "Indisponible" @@ -6011,7 +6046,7 @@ msgstr "Gérer" #: app/views/profile_editor/edit.rhtml:64 app/views/cms/view.rhtml:9 #: app/views/tasks/index.rhtml:37 app/views/tasks/index.rhtml:62 #: app/views/box_organizer/index.rhtml:5 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:43 msgid "Back to control panel" msgstr "Retour au panneau de contrôle" @@ -6183,7 +6218,7 @@ msgstr "Localisation : " #: app/views/maps/edit_location.rhtml:13 #: app/views/shared/_organization_custom_fields.rhtml:12 #: app/views/profile_editor/_person_form.rhtml:23 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15 msgid "Address (street and number)" msgstr "Adresse (n° et rue)" @@ -6651,23 +6686,19 @@ msgid "Supplier" msgstr "Fournisseur : %s" #: app/views/search/index.rhtml:7 app/views/search/category_index.rhtml:7 -#: plugins/solr/views/solr_plugin_public/index.rhtml:7 #, fuzzy msgid "Search Results" msgstr "Résultats de recherche pour «%s»" #: app/views/search/index.rhtml:14 app/views/search/category_index.rhtml:14 -#: plugins/solr/views/solr_plugin_public/index.rhtml:14 msgid "Sub-categories" msgstr "Sous-catégories :" #: app/views/search/index.rhtml:16 app/views/search/category_index.rhtml:16 -#: plugins/solr/views/solr_plugin_public/index.rhtml:16 msgid "No sub-categories" msgstr "Pas de sous-catégorie" #: app/views/search/_facets_unselect_menu.rhtml:3 -#: plugins/solr/views/search/_facets_unselect_menu.rhtml:3 #, fuzzy msgid "Applied filters" msgstr "Téléverser (upload) des fichiers" @@ -7652,7 +7683,7 @@ msgstr "" msgid "Home phone" msgstr "Téléphone domicile" -#: app/views/profile_editor/_person_form.rhtml:48 +#: app/views/profile_editor/_person_form.rhtml:50 #, fuzzy msgid "Custom formation" msgstr "Formation (autre)" @@ -10674,7 +10705,7 @@ msgid "[%s] Bsc management transferred to you." msgstr "" #: plugins/bsc/lib/bsc_plugin/contract.rb:33 -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Opened" msgstr "ouvrir" @@ -10939,107 +10970,118 @@ msgstr "" msgid "The tolerance time for editing this content is over." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:10 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:13 #, fuzzy msgid "Option updated successfully." msgstr "Fonctionnalités mises à jour avec succès." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:12 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:15 #, fuzzy msgid "Option wasn't updated successfully." msgstr "Fonctionnalités mises à jour avec succès." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:98 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:116 msgid "Request sent successfully. Check your email." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:121 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:139 #, fuzzy msgid "Basket displayed." msgstr "Ne pas afficher dans le menu" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:140 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:158 msgid "Basket hidden." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:162 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:186 +#, fuzzy +msgid "Delivery option updated." +msgstr "Détruire le profil" + +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:199 msgid "Can't join items from different enterprises." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:176 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:213 #, fuzzy msgid "There is no basket." msgstr "Il n'y a pas de catégorie." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:192 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:229 #, fuzzy msgid "This enterprise doesn't have this product." msgstr "Les entreprises pour lesquelles travaille cet utilisateur." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:206 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:243 #, fuzzy msgid "The basket doesn't have this product." msgstr "Les entreprises pour lesquelles travaille cet utilisateur." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:220 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:257 msgid "Invalid quantity." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:11 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:12 #, fuzzy msgid "A shopping basket feature for enterprises" msgstr "Désactiver la recherche d'entreprises" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:17 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:37 #, fuzzy msgid "Add to basket" msgstr "Ajouter un contact" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:44 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:65 #, fuzzy msgid "Shopping basket" msgstr "Statut de formation" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:47 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:68 msgid "Purchase reports" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:8 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:10 #, fuzzy msgid "[%s] Your buy request was performed successfully." msgstr "Votre mot de passe a bien été modifié." -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:21 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:25 msgid "[%s] You have a new buy request from %s." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:22 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41 +#, fuzzy +msgid "Free delivery" +msgstr "Recevoir une copie" + +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7 #, fuzzy msgid "Delivery" msgstr "Recevoir une copie" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:35 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53 #, fuzzy msgid "Item name" msgstr "Nom de fichier" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:52 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76 #: plugins/shopping_cart/views/cart.html.erb:9 #, fuzzy msgid "Total:" msgstr "Pour : " -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Canceled" msgstr "Annulé" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Confirmed" msgstr "Confirmez" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Shipped" msgstr "Partager " @@ -11950,6 +11992,27 @@ msgstr "" msgid "E-mail" msgstr "Adresse électronique" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9 +#, fuzzy +msgid "Delivery option" +msgstr "Détruire le profil" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Payment" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 +#, fuzzy +msgid "Change" +msgstr "Modifier l'image" + #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:1 #, fuzzy msgid "Basket options" @@ -11959,11 +12022,31 @@ msgstr "Plus d'options" msgid "Delivery?" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#, fuzzy +msgid "Option" +msgstr "Options" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:24 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:32 +#, fuzzy +msgid "Remove option" +msgstr "Plus d'options" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:27 +msgid "ADD NEW OPTION" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 #, fuzzy -msgid "Delivery price:" +msgid "Free delivery price:" msgstr "Détruire le profil" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 +msgid "Empty stands for no free delivery price." +msgstr "" + #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10 msgid "This is a notification e-mail about your buy request on %s." msgstr "" @@ -11989,17 +12072,30 @@ msgstr "" msgid "Phone number" msgstr "Un membre" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:37 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Money" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +#, fuzzy +msgid "Check" +msgstr "Tout cocher" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47 msgid "Here are the products you bought:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51 #, fuzzy msgid "Thanks for buying with us!" msgstr "Merci de vous être inscrit(e) !" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:45 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51 #, fuzzy msgid "A service of %s." msgstr "Un article de type «%s»" @@ -12012,25 +12108,25 @@ msgstr "" msgid "Below follows the customer informations:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45 msgid "And here are the items bought by this customer:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:40 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49 msgid "If there are any problems with this email contact the admin of %s." msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:14 #, fuzzy msgid "Delivery Address" msgstr "Adresse" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:23 #, fuzzy msgid "Send buy request" msgstr "Envoyer une requête" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/send_request.html.erb:1 +#: plugins/shopping_cart/views/shopping_cart_plugin/send_request.html.erb:1 msgid "Request sent successfully check your email." msgstr "" @@ -12182,10 +12278,6 @@ msgstr "" #~ msgid "Remove this comment and all its replies" #~ msgstr "Quitter ce groupe" -#, fuzzy -#~ msgid "Option" -#~ msgstr "Options" - #~ msgid "This profile is:" #~ msgstr "Ce profil est :" @@ -12283,9 +12375,6 @@ msgstr "" #~ msgid "product categorization" #~ msgstr "catégorisation de produits" -#~ msgid "There is no categories." -#~ msgstr "Il n'y a pas de catégorie." - #~ msgid "Listing sellers of %s witin %s km from %s %s" #~ msgstr "Liste des vendeurs de %s dans les %s km de %s %s" diff --git a/po/hy/noosfero.po b/po/hy/noosfero.po index a556eb0..8b5924b 100644 --- a/po/hy/noosfero.po +++ b/po/hy/noosfero.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.39.1\n" -"POT-Creation-Date: 2013-01-03 20:39-0000\n" +"Project-Id-Version: noosfero 0.39.3\n" +"POT-Creation-Date: 2013-01-19 21:42-0000\n" "PO-Revision-Date: 2009-10-26 16:20-0300\n" "Last-Translator: Anahit Minassian \n" "Language-Team: LANGUAGE \n" @@ -25,33 +25,36 @@ msgstr "" msgid "Please enter a valid email address." msgstr "" -#: app/controllers/public/content_viewer_controller.rb:38 -msgid "" -"You are not allowed to view this content. You can contact the owner of this " -"profile to request access then." +#: app/controllers/public/content_viewer_controller.rb:35 +#, fuzzy +msgid "You are not allowed to view this content." +msgstr "Դուք չեք կարող տեսնել տվյալ բովանդակությունը:" + +#: app/controllers/public/content_viewer_controller.rb:36 +msgid "You can contact the owner of this profile to request access then." msgstr "" -#: app/controllers/public/content_viewer_controller.rb:114 +#: app/controllers/public/content_viewer_controller.rb:116 #, fuzzy msgid "Notification of new comments to '%s' was successfully canceled" msgstr "Արտադրանքը հաջողությամբ հեռացված է" -#: app/controllers/public/content_viewer_controller.rb:135 +#: app/controllers/public/content_viewer_controller.rb:137 #, fuzzy msgid "Comment succesfully updated" msgstr "Մեկնաբանությունը հաջողությամբ հեռացված է:" -#: app/controllers/public/content_viewer_controller.rb:138 +#: app/controllers/public/content_viewer_controller.rb:140 #, fuzzy msgid "Comment could not be updated" msgstr "Սկզբնական նյութի թարմացումը ձախողված է" -#: app/controllers/public/content_viewer_controller.rb:143 +#: app/controllers/public/content_viewer_controller.rb:145 #, fuzzy msgid "Could not find the comment in the article" msgstr "Սկզբնական նյութի ստեղծումը ձախողված է" -#: app/controllers/public/content_viewer_controller.rb:157 +#: app/controllers/public/content_viewer_controller.rb:159 #: app/controllers/my_profile/cms_controller.rb:264 msgid "Please type the words correctly" msgstr "" @@ -64,7 +67,6 @@ msgstr "Կատեգորիաների էջ" #: app/controllers/public/search_controller.rb:151 #: app/models/people_block.rb:4 app/helpers/application_helper.rb:1097 #: app/helpers/assets_helper.rb:8 app/helpers/search_helper.rb:13 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:34 msgid "People" msgstr "Մարդիկ" @@ -72,7 +74,6 @@ msgstr "Մարդիկ" #: app/models/enterprises_block.rb:12 app/helpers/assets_helper.rb:10 #: app/helpers/search_helper.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/profile/_person_profile.rhtml:23 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:35 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:13 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:18 msgid "Enterprises" @@ -82,13 +83,11 @@ msgstr "Ձեռնարկություններ" #: app/models/products_block.rb:8 app/models/products_block.rb:12 #: app/models/enterprise.rb:130 app/helpers/application_helper.rb:539 #: app/helpers/assets_helper.rb:9 app/views/search/_sellers_form.rhtml:8 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:36 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:22 msgid "Products" msgstr "Արտադրանք" #: app/controllers/public/search_controller.rb:154 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:37 msgid "Upcoming events" msgstr "Գալիք իրադարձություններ" @@ -96,13 +95,11 @@ msgstr "Գալիք իրադարձություններ" #: app/models/communities_block.rb:4 app/helpers/application_helper.rb:524 #: app/helpers/application_helper.rb:1113 app/helpers/assets_helper.rb:11 #: app/helpers/search_helper.rb:14 app/views/profile/_person_profile.rhtml:41 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:38 msgid "Communities" msgstr "Համայնքներ" #: app/controllers/public/search_controller.rb:156 #: app/helpers/application_helper.rb:1081 app/helpers/search_helper.rb:11 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:39 #, fuzzy msgid "Contents" msgstr "Բովանդակության տեսակ" @@ -267,21 +264,13 @@ msgstr "" msgid "Could not create the e-mail" msgstr "Սկզբնական նյութի ստեղծումը ձախողված է" -#: app/controllers/public/profile_controller.rb:373 -msgid "The content here is available to %s's friends only." -msgstr "" - #: app/controllers/public/profile_controller.rb:376 -msgid "The contents in this community is available to members only." -msgstr "" - -#: app/controllers/public/profile_controller.rb:383 msgid "" "This profile is inaccessible. You don't have the permission to view the " "content here." msgstr "" -#: app/controllers/public/profile_controller.rb:383 +#: app/controllers/public/profile_controller.rb:376 msgid "Oops ... you cannot go ahead here" msgstr "" @@ -541,7 +530,7 @@ msgstr "Էջը չի գտնվել" #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:23 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:6 msgid "Name" msgstr "Անվանում" @@ -790,7 +779,7 @@ msgstr "" msgid "profile" msgstr "անհատական էջ" -#: app/models/product.rb:- app/models/article.rb:702 app/models/mailing.rb:- +#: app/models/product.rb:- app/models/article.rb:706 app/models/mailing.rb:- #: app/views/cms/view.rhtml:25 #: app/views/shared/reported_versions/_article.html.erb:3 #: app/views/shared/reported_versions/_comment.html.erb:3 @@ -830,15 +819,15 @@ msgstr "Ակտիվ" #: app/views/box_organizer/_link_list_block.rhtml:4 #: plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb:12 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:19 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:25 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:23 msgid "Address" msgstr "Հասցե" #: app/models/product.rb:- app/models/create_enterprise.rb:6 #: app/views/profile_editor/_person_form.rhtml:13 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:8 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:8 msgid "Contact phone" msgstr "Հեռախոս" @@ -888,7 +877,7 @@ msgstr "" msgid "Theme" msgstr "" -#: app/models/product.rb:- app/models/profile.rb:715 +#: app/models/product.rb:- app/models/profile.rb:723 msgid "Public profile" msgstr "" @@ -1002,7 +991,7 @@ msgid "Abstract" msgstr "Համառոտ ակնարկ" #: app/models/product.rb:- app/models/action_tracker_notification.rb:- -#: app/models/article.rb:706 app/models/person.rb:263 app/models/profile.rb:9 +#: app/models/article.rb:710 app/models/person.rb:266 app/models/profile.rb:9 #: app/models/profile_categorization.rb:- app/views/profile/index.rhtml:28 #: app/views/profile/index.rhtml:33 msgid "Profile" @@ -1201,7 +1190,7 @@ msgstr "Իրադարձություն" msgid "environment" msgstr "համակարգ" -#: app/models/product.rb:- app/models/organization.rb:99 +#: app/models/product.rb:- app/models/organization.rb:101 #: app/views/admin_panel/_site_info.rhtml:2 msgid "Contact email" msgstr "էլ. հասցե" @@ -1269,12 +1258,13 @@ msgstr "Արտադրանքի կատեգորիա" #: app/models/product.rb:- app/models/price_detail.rb:- #: app/views/manage_products/index.rhtml:6 -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:37 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:55 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 msgid "Price" msgstr "Գին" #: app/models/product.rb:- app/models/certifier.rb:- -#: app/models/organization.rb:99 app/views/search/_product.rhtml:52 +#: app/models/organization.rb:101 app/views/search/_product.rhtml:52 #: app/views/search/_article_description.rhtml:4 #: app/views/profile_editor/_person_form.rhtml:10 #: app/views/cms/_uploaded_file.rhtml:5 @@ -1349,7 +1339,7 @@ msgstr "Հեղինակ" #: app/views/cms/suggest_an_article.rhtml:17 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:18 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:16 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:7 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:7 msgid "Email" msgstr "Էլ. հասցե" @@ -1456,7 +1446,7 @@ msgid "Accept products" msgstr "Նայել ամբողջ արտադրանքը" #: app/models/product.rb:- app/models/create_enterprise.rb:8 -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 #: app/views/enterprise_validation/_details.rhtml:19 msgid "Acronym" msgstr "Հապավում" @@ -1484,52 +1474,52 @@ msgstr "Դիրք" msgid "Fetched at" msgstr "Ստեղծված է" -#: app/models/product.rb:76 app/helpers/display_helper.rb:34 -#: app/helpers/display_helper.rb:43 +#: app/models/product.rb:80 app/helpers/display_helper.rb:42 +#: app/helpers/display_helper.rb:51 msgid "Uncategorized product" msgstr "Չկատեգորիզացված արտադրանք" -#: app/models/product.rb:206 +#: app/models/product.rb:210 msgid "0%" msgstr "" -#: app/models/product.rb:207 +#: app/models/product.rb:211 msgid "25%" msgstr "" -#: app/models/product.rb:208 +#: app/models/product.rb:212 msgid "50%" msgstr "" -#: app/models/product.rb:209 +#: app/models/product.rb:213 msgid "75%" msgstr "" -#: app/models/product.rb:210 +#: app/models/product.rb:214 msgid "100%" msgstr "" -#: app/models/product.rb:234 +#: app/models/product.rb:238 msgid " cert. " msgstr "" -#: app/models/product.rb:259 +#: app/models/product.rb:263 #, fuzzy msgid "Related products" msgstr "Նայել ամբողջ արտադրանքը" -#: app/models/product.rb:260 app/models/contact.rb:- app/models/person.rb:204 -#: app/models/profile.rb:942 app/models/enterprise.rb:23 +#: app/models/product.rb:264 app/models/contact.rb:- app/models/person.rb:207 +#: app/models/profile.rb:950 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:11 app/views/search/_product.rhtml:59 #: app/views/search/_profile.rhtml:21 #: app/views/profile_editor/_person_form.rhtml:21 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:10 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:12 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:18 msgid "City" msgstr "Քաղաք" -#: app/models/product.rb:261 app/views/search/_product.rhtml:65 +#: app/models/product.rb:265 app/views/search/_product.rhtml:65 #, fuzzy msgid "Qualifiers" msgstr "Որակ" @@ -1597,7 +1587,7 @@ msgstr "Նորություններ" #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:16 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:52 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:42 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:25 msgid "Save" msgstr "Պահպանել" @@ -1695,7 +1685,6 @@ msgstr "Կարմիր" #: app/views/search/_search_form.rhtml:24 #: app/views/cms/_text_editor_sidebar.rhtml:36 app/views/home/index.rhtml:61 #: app/views/profile_members/_add_admins.rhtml:5 -#: plugins/solr/views/search/_search_form.rhtml:24 msgid "Search" msgstr "Որոնում" @@ -1922,7 +1911,7 @@ msgstr "" msgid "Message" msgstr "" -#: app/models/contact.rb:- app/models/person.rb:204 +#: app/models/contact.rb:- app/models/person.rb:207 #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:10 #: app/views/profile_editor/_person_form.rhtml:20 #: plugins/bsc/lib/bsc_plugin/contract.rb:46 @@ -1956,11 +1945,11 @@ msgstr "Հեռացնել" msgid "(unauthenticated user)" msgstr "(մասնակիցն անվավեր է)" -#: app/models/comment.rb:179 +#: app/models/comment.rb:183 msgid "[%s] you got a new comment!" msgstr "" -#: app/models/comment.rb:194 +#: app/models/comment.rb:198 #, fuzzy msgid "[%s] %s commented on a content of %s" msgstr "Ամենից հաճախ մեկնաբանվող հոդվածները" @@ -2060,7 +2049,7 @@ msgstr "" msgid "cyclical reference is not allowed." msgstr "" -#: app/models/article.rb:170 app/models/organization.rb:99 +#: app/models/article.rb:170 app/models/organization.rb:101 msgid "Tag list" msgstr "Պիտակների ցուցակ" @@ -2089,66 +2078,66 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/article.rb:605 +#: app/models/article.rb:609 #, fuzzy msgid "no comments" msgstr "Մեկ մեկնաբանություն" -#: app/models/article.rb:606 +#: app/models/article.rb:610 #, fuzzy msgid "one comment" msgstr "Մեկ մեկնաբանություն" -#: app/models/article.rb:607 +#: app/models/article.rb:611 #, fuzzy msgid "%s comments" msgstr "Մեկնաբանություն թողնել" -#: app/models/article.rb:614 +#: app/models/article.rb:618 msgid "no views" msgstr "" -#: app/models/article.rb:615 +#: app/models/article.rb:619 #, fuzzy msgid "one view" msgstr "Բովանդակության տեսակ" -#: app/models/article.rb:616 +#: app/models/article.rb:620 msgid "%s views" msgstr "" -#: app/models/article.rb:621 +#: app/models/article.rb:625 #, fuzzy msgid "Created at: " msgstr "Ստեղծված է" -#: app/models/article.rb:703 +#: app/models/article.rb:707 #, fuzzy msgid "Published date" msgstr "Հրատարակված" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Older than one year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 #, fuzzy msgid "In the last year" msgstr "Նկարադարան" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last month" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last week" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last day" msgstr "" -#: app/models/article.rb:707 app/helpers/application_helper.rb:614 +#: app/models/article.rb:711 app/helpers/application_helper.rb:614 #: app/views/search/_article_categories.rhtml:2 #: app/views/categories/index.rhtml:1 app/views/admin_panel/index.rhtml:41 #: app/views/content_viewer/view_page.rhtml:77 @@ -2451,17 +2440,22 @@ msgstr "" msgid "Redirects the user to his control panel." msgstr "Վերադառնալ կառավարման վահանակ" -#: app/models/environment.rb:579 +#: app/models/environment.rb:238 +#, fuzzy +msgid "This enterprise needs to be enabled." +msgstr "Ձեր ձեռնարկությունը արգելափակվել է:" + +#: app/models/environment.rb:580 msgid "Only one Virtual Community can be the default one" msgstr "" "Որպես նախնական համայնք, դուք կարող եք ընտրել միայն մեկ վիրտուալ համայնք" -#: app/models/environment.rb:842 +#: app/models/environment.rb:843 #, fuzzy msgid "is not available." msgstr "Արտադրանք և ծառայություններ" -#: app/models/environment.rb:850 +#: app/models/environment.rb:851 msgid "have unsupported languages." msgstr "" @@ -2710,9 +2704,9 @@ msgstr "" msgid "Feed title" msgstr "Դերի փոփոխումը ձախողված է" -#: app/models/external_feed.rb:- app/models/person.rb:266 -#: app/models/person.rb:277 app/models/organization.rb:121 -#: app/models/organization.rb:132 app/models/blog.rb:13 app/models/blog.rb:17 +#: app/models/external_feed.rb:- app/models/person.rb:269 +#: app/models/person.rb:280 app/models/organization.rb:123 +#: app/models/organization.rb:134 app/models/blog.rb:13 app/models/blog.rb:17 #: app/models/enterprise.rb:129 app/models/enterprise.rb:145 msgid "Blog" msgstr "" @@ -2830,8 +2824,8 @@ msgstr "Վավերացման մեթոդաբանություն" msgid "Restrictions" msgstr "Սահմանափակումներ" -#: app/models/validation_info.rb:- app/models/person.rb:195 -#: app/views/profile_editor/_person_form.rhtml:60 +#: app/models/validation_info.rb:- app/models/person.rb:198 +#: app/views/profile_editor/_person_form.rhtml:62 msgid "Organization" msgstr "Կազմակերպություն" @@ -2870,113 +2864,130 @@ msgstr "դպրոց" msgid "family" msgstr "ընտանիք" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:14 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:14 msgid "Cell phone" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:15 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:15 msgid "Comercial phone" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:18 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:18 msgid "Nationality" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:27 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:29 msgid "Schooling" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:52 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:54 msgid "Area of study" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:59 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:61 msgid "Professional activity" msgstr "" -#: app/models/person.rb:195 app/models/enterprise.rb:23 -#: app/views/profile_editor/_person_form.rhtml:61 +#: app/models/person.rb:198 app/models/enterprise.rb:23 +#: app/views/profile_editor/_person_form.rhtml:63 msgid "Organization website" msgstr "" -#: app/models/person.rb:198 +#: app/models/person.rb:201 msgid "Schooling status" msgstr "" -#: app/models/person.rb:201 app/helpers/profile_editor_helper.rb:26 -#: app/views/profile_editor/_person_form.rhtml:45 +#: app/models/person.rb:204 app/helpers/profile_editor_helper.rb:26 +#: app/views/profile_editor/_person_form.rhtml:47 msgid "Education" msgstr "Կրթություն" -#: app/models/person.rb:201 +#: app/models/person.rb:204 #, fuzzy msgid "Custom education" msgstr "Կրթություն" -#: app/models/person.rb:201 app/views/profile_editor/_person_form.rhtml:55 +#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:57 msgid "Custom area of study" msgstr "" -#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:12 +#: app/models/person.rb:207 app/views/profile_editor/_person_form.rhtml:12 msgid "Contact information" msgstr "Էլ. հասցե" -#: app/models/person.rb:204 app/models/enterprise.rb:23 +#: app/models/person.rb:207 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:9 -#: app/views/shared/_organization_custom_fields.rhtml:16 +#: app/views/shared/_organization_custom_fields.rhtml:18 #: app/views/profile_editor/_person_form.rhtml:19 #: plugins/bsc/views/shared/_fields.html.erb:65 msgid "Country" msgstr "Երկիր" -#: app/models/person.rb:204 +#: app/models/person.rb:207 msgid "Sex" msgstr "Սեռ" -#: app/models/person.rb:204 +#: app/models/person.rb:207 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 msgid "Zip code" msgstr "" -#: app/models/person.rb:235 +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:14 +#: app/views/profile_editor/_person_form.rhtml:25 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17 +#, fuzzy +msgid "District" +msgstr "Սահմանափակումներ" + +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/profile_editor/_person_form.rhtml:24 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16 +#, fuzzy +msgid "Address reference" +msgstr "Հասցե" + +#: app/models/person.rb:238 msgid "%{fn} is already used by other user" msgstr "" -#: app/models/person.rb:264 app/models/organization.rb:120 +#: app/models/person.rb:267 app/models/organization.rb:122 msgid "Image gallery" msgstr "Նկարադարան" -#: app/models/person.rb:265 app/models/organization.rb:119 +#: app/models/person.rb:268 app/models/organization.rb:121 #: app/helpers/application_helper.rb:532 app/helpers/application_helper.rb:541 msgid "Agenda" msgstr "" -#: app/models/person.rb:278 app/models/gallery.rb:4 app/models/gallery.rb:8 -#: app/models/organization.rb:133 app/views/search/_uploaded_file.rhtml:14 +#: app/models/person.rb:281 app/models/gallery.rb:4 app/models/gallery.rb:8 +#: app/models/organization.rb:135 app/views/search/_uploaded_file.rhtml:14 #, fuzzy msgid "Gallery" msgstr "Նկարադարան" -#: app/models/person.rb:390 +#: app/models/person.rb:393 #, fuzzy msgid "none" msgstr "Չկա" -#: app/models/person.rb:391 +#: app/models/person.rb:394 #, fuzzy msgid "one friend" msgstr "Նոր ընկեր" -#: app/models/person.rb:392 +#: app/models/person.rb:395 #, fuzzy msgid "%s friends" msgstr "%s-ի ընկերները" -#: app/models/person.rb:427 +#: app/models/person.rb:430 msgid "You just left %s." msgstr "" -#: app/models/person.rb:451 app/models/profile.rb:868 +#: app/models/person.rb:454 app/models/profile.rb:876 msgid "Edit Profile" msgstr "Փոփոխել իմ անհատական էջը" @@ -3073,75 +3084,75 @@ msgstr "Հեռացնել անդամին" msgid "Send e-Mail to members" msgstr "Հեռացնել անդամին" -#: app/models/profile.rb:301 +#: app/models/profile.rb:305 msgid "is not a template." msgstr "" -#: app/models/profile.rb:613 +#: app/models/profile.rb:621 #, fuzzy msgid "%s can't have members" msgstr "%s - ը անդամներ ունենալ չի կարող" -#: app/models/profile.rb:634 +#: app/models/profile.rb:642 msgid "%s can't has moderators" msgstr "մոդերատորներ ունենալ չի կարող" -#: app/models/profile.rb:715 +#: app/models/profile.rb:723 #, fuzzy msgid "Private profile" msgstr "Փոփոխել անհատական էջը" -#: app/models/profile.rb:812 +#: app/models/profile.rb:820 #, fuzzy msgid "Since: " msgstr "Գին" -#: app/models/profile.rb:827 +#: app/models/profile.rb:835 #, fuzzy msgid "no activity" msgstr "Տնտեսական գործունեություն" -#: app/models/profile.rb:828 +#: app/models/profile.rb:836 #, fuzzy msgid "one activity" msgstr "Տնտեսական գործունեություն" -#: app/models/profile.rb:829 +#: app/models/profile.rb:837 #, fuzzy msgid "%s activities" msgstr "Տնտեսական գործունեություն" -#: app/models/profile.rb:835 +#: app/models/profile.rb:843 #, fuzzy msgid "no members" msgstr "Նոր անդամ" -#: app/models/profile.rb:836 +#: app/models/profile.rb:844 #, fuzzy msgid "one member" msgstr "Նոր անդամ" -#: app/models/profile.rb:837 +#: app/models/profile.rb:845 #, fuzzy msgid "%s members" msgstr "%s-ի անդամները" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 #, fuzzy msgid "facets|Enabled" msgstr "Անհատական էջ|Ակտիվացված է" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 #, fuzzy msgid "facets|Not enabled" msgstr "%s ակտիվացված չէ:" -#: app/models/profile.rb:940 +#: app/models/profile.rb:948 #, fuzzy msgid "Situation" msgstr "Կառավարման վահանակ" -#: app/models/profile.rb:970 +#: app/models/profile.rb:978 #, fuzzy msgid "Profile Info and settings" msgstr "Անհանատական էջի տվյալների բաժին" @@ -3187,7 +3198,7 @@ msgstr "Որակ" msgid "Certifier" msgstr "Որոշիչ" -#: app/models/unit.rb:- app/views/catalog/index.rhtml:37 +#: app/models/unit.rb:- app/views/catalog/index.rhtml:59 #, fuzzy msgid "unit" msgstr "Համայնք" @@ -3607,23 +3618,23 @@ msgstr "Կատեգորիաների էջ" msgid "profilecategorization" msgstr "Անհատական էջի կատեգորիզացում" -#: app/models/create_enterprise.rb:7 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:101 msgid "Contact person" msgstr "Կապ պահպանող անձ" -#: app/models/create_enterprise.rb:9 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:101 msgid "Foundation year" msgstr "Հիմնադրման տարին" -#: app/models/create_enterprise.rb:10 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:101 msgid "Legal form" msgstr "Իրավաբանական հիմք" -#: app/models/create_enterprise.rb:11 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:101 msgid "Economic activity" msgstr "Տնտեսական գործունեություն" -#: app/models/create_enterprise.rb:12 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:101 msgid "Management information" msgstr "Տեղեկություններ ղեկավարության մասին" @@ -3759,16 +3770,16 @@ msgstr "%s-ը ցանկանում է %s-ի անդամ դառնալ:" msgid " is inviting you to join \"\" on ." msgstr "" -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 msgid "Display name" msgstr "Ցուցադրել անունը" -#: app/models/organization.rb:117 +#: app/models/organization.rb:119 #, fuzzy msgid "Community's profile" msgstr "Համայնքներ" -#: app/models/organization.rb:118 +#: app/models/organization.rb:120 #, fuzzy msgid "Invite Friends" msgstr "Կառավարել ընկերներին" @@ -3874,9 +3885,9 @@ msgid "Activities short description" msgstr "" #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:12 -#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/shared/_organization_custom_fields.rhtml:15 #: app/views/profile_editor/_person_form.rhtml:22 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:13 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:19 msgid "ZIP code" msgstr "" @@ -4538,11 +4549,11 @@ msgstr "" msgid "Sign out of chat" msgstr "" -#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:12 +#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:20 msgid "No product" msgstr "Արտադրանք չկա" -#: app/helpers/display_helper.rb:59 +#: app/helpers/display_helper.rb:67 msgid "Are you sure you want to visit this web site?" msgstr "Ցանկանո՞ւմ եք արդյոք այս կայքն այցելել:" @@ -4849,7 +4860,7 @@ msgstr "Հեռավորություն" msgid "Source: %s" msgstr "Գին %s" -#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:17 +#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:39 #: app/views/search/_image.rhtml:43 app/views/cms/_text_editor_sidebar.rhtml:3 #: app/views/manage_products/_display_image.rhtml:6 #, fuzzy @@ -4908,6 +4919,14 @@ msgstr "" msgid "Type in a search term" msgstr "Դիզակտիվացնել ձեռնարկությունների որոնումը" +#: app/helpers/application_helper.rb:1418 +msgid "The content here is available to %s's friends only." +msgstr "" + +#: app/helpers/application_helper.rb:1421 +msgid "The contents in this community is available to members only." +msgstr "" + #: app/helpers/events_helper.rb:4 msgid "Select a day on the left to display it's events here" msgstr "" @@ -5066,6 +5085,11 @@ msgstr "" msgid "Delete" msgstr "Հեռացնել" +#: app/helpers/catalog_helper.rb:7 +#, fuzzy +msgid "Start" +msgstr "Սկզբնաժամկետ" + #: app/helpers/blog_helper.rb:10 msgid "New post" msgstr "" @@ -5774,55 +5798,65 @@ msgstr "" msgid "I want to receive a copy of the message in my e-mail." msgstr "" -#: app/views/catalog/index.rhtml:5 app/views/blocks/profile_info.rhtml:21 +#: app/views/catalog/index.rhtml:4 app/views/blocks/profile_info.rhtml:21 #: app/views/profile/_organization_profile.rhtml:26 msgid "Products/Services" msgstr "Արտադրանք/Ծառայություններ" -#: app/views/catalog/index.rhtml:20 app/views/search/_image.rhtml:35 +#: app/views/catalog/index.rhtml:16 +#, fuzzy +msgid "There are no sub-categories for %s" +msgstr "Այստեղ կատեգորիաներ չկան:" + +#: app/views/catalog/index.rhtml:34 +#, fuzzy +msgid "Highlighted product" +msgstr "Հոդվածների քանակի սահմանափակում" + +#: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35 #: app/views/search/_image.rhtml:47 #, fuzzy msgid "No image" msgstr "պատկեր" -#: app/views/catalog/index.rhtml:30 +#: app/views/catalog/index.rhtml:52 msgid "from " msgstr "" -#: app/views/catalog/index.rhtml:31 +#: app/views/catalog/index.rhtml:53 #, fuzzy msgid "by " msgstr "որոնել ըստ %s" -#: app/views/catalog/index.rhtml:37 +#: app/views/catalog/index.rhtml:59 msgid " / " msgstr "" -#: app/views/catalog/index.rhtml:45 +#: app/views/catalog/index.rhtml:67 #, fuzzy msgid "description" msgstr "Նկարագրություն" -#: app/views/catalog/index.rhtml:55 +#: app/views/catalog/index.rhtml:77 #, fuzzy msgid "price composition" msgstr "Անձնական տվյալների հատկություններ" -#: app/views/catalog/index.rhtml:78 +#: app/views/catalog/index.rhtml:100 #, fuzzy msgid "inputs and raw materials" msgstr "Ավելացնել նոր սկզբնական նյութ" -#: app/views/catalog/index.rhtml:84 +#: app/views/catalog/index.rhtml:106 msgid "%{amount_used} %{unit} of" msgstr "" -#: app/views/catalog/index.rhtml:95 +#: app/views/catalog/index.rhtml:117 #, fuzzy msgid "qualifiers" msgstr "Որակ" -#: app/views/catalog/index.rhtml:103 +#: app/views/catalog/index.rhtml:125 #, fuzzy msgid "product unavailable" msgstr "Արտադրանք և ծառայություններ" @@ -5905,7 +5939,7 @@ msgstr "Կառավարել" #: app/views/profile_editor/edit.rhtml:64 app/views/cms/view.rhtml:9 #: app/views/tasks/index.rhtml:37 app/views/tasks/index.rhtml:62 #: app/views/box_organizer/index.rhtml:5 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:43 msgid "Back to control panel" msgstr "Վերադառնալ կառավարման վահանակ" @@ -6075,7 +6109,7 @@ msgstr "Վայր" #: app/views/maps/edit_location.rhtml:13 #: app/views/shared/_organization_custom_fields.rhtml:12 #: app/views/profile_editor/_person_form.rhtml:23 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15 msgid "Address (street and number)" msgstr "" @@ -6530,23 +6564,19 @@ msgid "Supplier" msgstr "Առաքիչ %s" #: app/views/search/index.rhtml:7 app/views/search/category_index.rhtml:7 -#: plugins/solr/views/solr_plugin_public/index.rhtml:7 #, fuzzy msgid "Search Results" msgstr "«%s»-ի որոնման արդյունքները" #: app/views/search/index.rhtml:14 app/views/search/category_index.rhtml:14 -#: plugins/solr/views/solr_plugin_public/index.rhtml:14 msgid "Sub-categories" msgstr "Ենթակատեգորիաներ" #: app/views/search/index.rhtml:16 app/views/search/category_index.rhtml:16 -#: plugins/solr/views/solr_plugin_public/index.rhtml:16 msgid "No sub-categories" msgstr "Ենթակատեգորիաներ չկան" #: app/views/search/_facets_unselect_menu.rhtml:3 -#: plugins/solr/views/search/_facets_unselect_menu.rhtml:3 #, fuzzy msgid "Applied filters" msgstr "Վերբեռնած ֆայլ" @@ -7467,7 +7497,7 @@ msgstr "" msgid "Home phone" msgstr "" -#: app/views/profile_editor/_person_form.rhtml:48 +#: app/views/profile_editor/_person_form.rhtml:50 #, fuzzy msgid "Custom formation" msgstr "Կրթություն" @@ -10411,7 +10441,7 @@ msgid "[%s] Bsc management transferred to you." msgstr "" #: plugins/bsc/lib/bsc_plugin/contract.rb:33 -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Opened" msgstr "բացել" @@ -10673,104 +10703,115 @@ msgstr "" msgid "The tolerance time for editing this content is over." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:10 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:13 #, fuzzy msgid "Option updated successfully." msgstr "Առանձնահատկությունները հաջողությամբ թարմացված են:" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:12 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:15 #, fuzzy msgid "Option wasn't updated successfully." msgstr "Առանձնահատկությունները հաջողությամբ թարմացված են:" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:98 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:116 msgid "Request sent successfully. Check your email." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:121 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:139 #, fuzzy msgid "Basket displayed." msgstr "Մենյուի մեջ ցույց չտալ" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:140 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:158 msgid "Basket hidden." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:162 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:186 +#, fuzzy +msgid "Delivery option updated." +msgstr "Վերացնել անհատական էջը" + +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:199 msgid "Can't join items from different enterprises." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:176 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:213 #, fuzzy msgid "There is no basket." msgstr "Այստեղ կատեգորիաներ չկան:" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:192 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:229 #, fuzzy msgid "This enterprise doesn't have this product." msgstr "Այս մասնակիցն աշխատում է հետևյալ ձեռնարկություններում" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:206 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:243 #, fuzzy msgid "The basket doesn't have this product." msgstr "Այս մասնակիցն աշխատում է հետևյալ ձեռնարկություններում" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:220 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:257 msgid "Invalid quantity." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:11 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:12 #, fuzzy msgid "A shopping basket feature for enterprises" msgstr "Դիզակտիվացնել ձեռնարկությունների որոնումը" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:17 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:37 msgid "Add to basket" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:44 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:65 msgid "Shopping basket" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:47 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:68 msgid "Purchase reports" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:8 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:10 #, fuzzy msgid "[%s] Your buy request was performed successfully." msgstr "Ձեր գաղտնաբառը բարեհաջող փոխվել է:" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:21 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:25 msgid "[%s] You have a new buy request from %s." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:22 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41 +#, fuzzy +msgid "Free delivery" +msgstr "Դեկտեմբեր" + +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7 #, fuzzy msgid "Delivery" msgstr "Դեկտեմբեր" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:35 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53 #, fuzzy msgid "Item name" msgstr "Ֆայլի անուն" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:52 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76 #: plugins/shopping_cart/views/cart.html.erb:9 msgid "Total:" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Canceled" msgstr "Հրաժարում" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Confirmed" msgstr "Հաստատել" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Shipped" msgstr "Տարածաշրջան %d" @@ -11662,6 +11703,27 @@ msgstr "" msgid "E-mail" msgstr "Էլ. հասցե" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9 +#, fuzzy +msgid "Delivery option" +msgstr "Վերացնել անհատական էջը" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Payment" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 +#, fuzzy +msgid "Change" +msgstr "Փոխել նկարը" + #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:1 #, fuzzy msgid "Basket options" @@ -11671,11 +11733,31 @@ msgstr "Կառավարման հատկություններ" msgid "Delivery?" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#, fuzzy +msgid "Option" +msgstr "Հատկություններ" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:24 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:32 +#, fuzzy +msgid "Remove option" +msgstr "Հեռացնել բաժինը" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:27 +msgid "ADD NEW OPTION" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 #, fuzzy -msgid "Delivery price:" +msgid "Free delivery price:" msgstr "Վերացնել անհատական էջը" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 +msgid "Empty stands for no free delivery price." +msgstr "" + #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10 msgid "This is a notification e-mail about your buy request on %s." msgstr "" @@ -11700,17 +11782,29 @@ msgstr "" msgid "Phone number" msgstr "Նոր անդամ" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:37 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Money" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Check" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47 msgid "Here are the products you bought:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51 #, fuzzy msgid "Thanks for buying with us!" msgstr "Շնորհակալություն գրանցվելու համար:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:45 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51 msgid "A service of %s." msgstr "" @@ -11722,24 +11816,24 @@ msgstr "" msgid "Below follows the customer informations:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45 msgid "And here are the items bought by this customer:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:40 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49 msgid "If there are any problems with this email contact the admin of %s." msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:14 #, fuzzy msgid "Delivery Address" msgstr "Հասցե" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:23 msgid "Send buy request" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/send_request.html.erb:1 +#: plugins/shopping_cart/views/shopping_cart_plugin/send_request.html.erb:1 msgid "Request sent successfully check your email." msgstr "" @@ -11878,10 +11972,6 @@ msgstr "" #~ msgid "Remove this comment and all its replies" #~ msgstr "Դուրս գալ այս համայնքից" -#, fuzzy -#~ msgid "Option" -#~ msgstr "Հատկություններ" - #~ msgid "This profile is:" #~ msgstr "Այս անհատական էջը" @@ -11950,9 +12040,6 @@ msgstr "" #~ msgid "product categorization" #~ msgstr "արտադրանքի կատեգորիզացում" -#~ msgid "There is no categories." -#~ msgstr "Այստեղ կատեգորիաներ չկան:" - #~ msgid "Listing sellers of %s witin %s km from %s %s" #~ msgstr "%s կմ հեռավորության վրա գտնվող %s-ի վաճառողների ցուցակ" diff --git a/po/it/noosfero.po b/po/it/noosfero.po index 404cc1e..5b88556 100644 --- a/po/it/noosfero.po +++ b/po/it/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.39.1\n" -"POT-Creation-Date: 2013-01-03 20:39-0000\n" +"Project-Id-Version: noosfero 0.39.3\n" +"POT-Creation-Date: 2013-01-19 21:42-0000\n" "PO-Revision-Date: 2012-06-05 10:27-0300\n" "Last-Translator: Daniela Feitosa \n" "Language-Team: LANGUAGE TEAM \n" @@ -28,29 +28,31 @@ msgstr "" msgid "Please enter a valid email address." msgstr "" -#: app/controllers/public/content_viewer_controller.rb:38 -msgid "" -"You are not allowed to view this content. You can contact the owner of this " -"profile to request access then." +#: app/controllers/public/content_viewer_controller.rb:35 +msgid "You are not allowed to view this content." +msgstr "" + +#: app/controllers/public/content_viewer_controller.rb:36 +msgid "You can contact the owner of this profile to request access then." msgstr "" -#: app/controllers/public/content_viewer_controller.rb:114 +#: app/controllers/public/content_viewer_controller.rb:116 msgid "Notification of new comments to '%s' was successfully canceled" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:135 +#: app/controllers/public/content_viewer_controller.rb:137 msgid "Comment succesfully updated" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:138 +#: app/controllers/public/content_viewer_controller.rb:140 msgid "Comment could not be updated" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:143 +#: app/controllers/public/content_viewer_controller.rb:145 msgid "Could not find the comment in the article" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:157 +#: app/controllers/public/content_viewer_controller.rb:159 #: app/controllers/my_profile/cms_controller.rb:264 msgid "Please type the words correctly" msgstr "" @@ -62,7 +64,6 @@ msgstr "" #: app/controllers/public/search_controller.rb:151 #: app/models/people_block.rb:4 app/helpers/application_helper.rb:1097 #: app/helpers/assets_helper.rb:8 app/helpers/search_helper.rb:13 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:34 msgid "People" msgstr "" @@ -70,7 +71,6 @@ msgstr "" #: app/models/enterprises_block.rb:12 app/helpers/assets_helper.rb:10 #: app/helpers/search_helper.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/profile/_person_profile.rhtml:23 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:35 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:13 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:18 msgid "Enterprises" @@ -80,13 +80,11 @@ msgstr "" #: app/models/products_block.rb:8 app/models/products_block.rb:12 #: app/models/enterprise.rb:130 app/helpers/application_helper.rb:539 #: app/helpers/assets_helper.rb:9 app/views/search/_sellers_form.rhtml:8 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:36 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:22 msgid "Products" msgstr "" #: app/controllers/public/search_controller.rb:154 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:37 msgid "Upcoming events" msgstr "" @@ -94,13 +92,11 @@ msgstr "" #: app/models/communities_block.rb:4 app/helpers/application_helper.rb:524 #: app/helpers/application_helper.rb:1113 app/helpers/assets_helper.rb:11 #: app/helpers/search_helper.rb:14 app/views/profile/_person_profile.rhtml:41 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:38 msgid "Communities" msgstr "" #: app/controllers/public/search_controller.rb:156 #: app/helpers/application_helper.rb:1081 app/helpers/search_helper.rb:11 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:39 msgid "Contents" msgstr "" @@ -240,21 +236,13 @@ msgstr "" msgid "Could not create the e-mail" msgstr "" -#: app/controllers/public/profile_controller.rb:373 -msgid "The content here is available to %s's friends only." -msgstr "" - #: app/controllers/public/profile_controller.rb:376 -msgid "The contents in this community is available to members only." -msgstr "" - -#: app/controllers/public/profile_controller.rb:383 msgid "" "This profile is inaccessible. You don't have the permission to view the " "content here." msgstr "" -#: app/controllers/public/profile_controller.rb:383 +#: app/controllers/public/profile_controller.rb:376 msgid "Oops ... you cannot go ahead here" msgstr "" @@ -500,7 +488,7 @@ msgstr "" #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:23 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:6 msgid "Name" msgstr "" @@ -732,7 +720,7 @@ msgstr "" msgid "profile" msgstr "" -#: app/models/product.rb:- app/models/article.rb:702 app/models/mailing.rb:- +#: app/models/product.rb:- app/models/article.rb:706 app/models/mailing.rb:- #: app/views/cms/view.rhtml:25 #: app/views/shared/reported_versions/_article.html.erb:3 #: app/views/shared/reported_versions/_comment.html.erb:3 @@ -772,15 +760,15 @@ msgstr "" #: app/views/box_organizer/_link_list_block.rhtml:4 #: plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb:12 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:19 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:25 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:23 msgid "Address" msgstr "" #: app/models/product.rb:- app/models/create_enterprise.rb:6 #: app/views/profile_editor/_person_form.rhtml:13 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:8 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:8 msgid "Contact phone" msgstr "" @@ -830,7 +818,7 @@ msgstr "" msgid "Theme" msgstr "" -#: app/models/product.rb:- app/models/profile.rb:715 +#: app/models/product.rb:- app/models/profile.rb:723 msgid "Public profile" msgstr "" @@ -936,7 +924,7 @@ msgid "Abstract" msgstr "" #: app/models/product.rb:- app/models/action_tracker_notification.rb:- -#: app/models/article.rb:706 app/models/person.rb:263 app/models/profile.rb:9 +#: app/models/article.rb:710 app/models/person.rb:266 app/models/profile.rb:9 #: app/models/profile_categorization.rb:- app/views/profile/index.rhtml:28 #: app/views/profile/index.rhtml:33 msgid "Profile" @@ -1115,7 +1103,7 @@ msgstr "" msgid "environment" msgstr "" -#: app/models/product.rb:- app/models/organization.rb:99 +#: app/models/product.rb:- app/models/organization.rb:101 #: app/views/admin_panel/_site_info.rhtml:2 msgid "Contact email" msgstr "" @@ -1179,12 +1167,13 @@ msgstr "" #: app/models/product.rb:- app/models/price_detail.rb:- #: app/views/manage_products/index.rhtml:6 -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:37 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:55 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 msgid "Price" msgstr "" #: app/models/product.rb:- app/models/certifier.rb:- -#: app/models/organization.rb:99 app/views/search/_product.rhtml:52 +#: app/models/organization.rb:101 app/views/search/_product.rhtml:52 #: app/views/search/_article_description.rhtml:4 #: app/views/profile_editor/_person_form.rhtml:10 #: app/views/cms/_uploaded_file.rhtml:5 @@ -1254,7 +1243,7 @@ msgstr "" #: app/views/cms/suggest_an_article.rhtml:17 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:18 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:16 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:7 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:7 msgid "Email" msgstr "" @@ -1352,7 +1341,7 @@ msgid "Accept products" msgstr "" #: app/models/product.rb:- app/models/create_enterprise.rb:8 -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 #: app/views/enterprise_validation/_details.rhtml:19 msgid "Acronym" msgstr "" @@ -1378,51 +1367,51 @@ msgstr "" msgid "Fetched at" msgstr "" -#: app/models/product.rb:76 app/helpers/display_helper.rb:34 -#: app/helpers/display_helper.rb:43 +#: app/models/product.rb:80 app/helpers/display_helper.rb:42 +#: app/helpers/display_helper.rb:51 msgid "Uncategorized product" msgstr "" -#: app/models/product.rb:206 +#: app/models/product.rb:210 msgid "0%" msgstr "" -#: app/models/product.rb:207 +#: app/models/product.rb:211 msgid "25%" msgstr "" -#: app/models/product.rb:208 +#: app/models/product.rb:212 msgid "50%" msgstr "" -#: app/models/product.rb:209 +#: app/models/product.rb:213 msgid "75%" msgstr "" -#: app/models/product.rb:210 +#: app/models/product.rb:214 msgid "100%" msgstr "" -#: app/models/product.rb:234 +#: app/models/product.rb:238 msgid " cert. " msgstr "" -#: app/models/product.rb:259 +#: app/models/product.rb:263 msgid "Related products" msgstr "" -#: app/models/product.rb:260 app/models/contact.rb:- app/models/person.rb:204 -#: app/models/profile.rb:942 app/models/enterprise.rb:23 +#: app/models/product.rb:264 app/models/contact.rb:- app/models/person.rb:207 +#: app/models/profile.rb:950 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:11 app/views/search/_product.rhtml:59 #: app/views/search/_profile.rhtml:21 #: app/views/profile_editor/_person_form.rhtml:21 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:10 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:12 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:18 msgid "City" msgstr "" -#: app/models/product.rb:261 app/views/search/_product.rhtml:65 +#: app/models/product.rb:265 app/views/search/_product.rhtml:65 msgid "Qualifiers" msgstr "" @@ -1488,7 +1477,7 @@ msgstr "" #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:16 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:52 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:42 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:25 msgid "Save" msgstr "" @@ -1584,7 +1573,6 @@ msgstr "" #: app/views/search/_search_form.rhtml:24 #: app/views/cms/_text_editor_sidebar.rhtml:36 app/views/home/index.rhtml:61 #: app/views/profile_members/_add_admins.rhtml:5 -#: plugins/solr/views/search/_search_form.rhtml:24 msgid "Search" msgstr "" @@ -1793,7 +1781,7 @@ msgstr "" msgid "Message" msgstr "" -#: app/models/contact.rb:- app/models/person.rb:204 +#: app/models/contact.rb:- app/models/person.rb:207 #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:10 #: app/views/profile_editor/_person_form.rhtml:20 #: plugins/bsc/lib/bsc_plugin/contract.rb:46 @@ -1826,11 +1814,11 @@ msgstr "" msgid "(unauthenticated user)" msgstr "" -#: app/models/comment.rb:179 +#: app/models/comment.rb:183 msgid "[%s] you got a new comment!" msgstr "" -#: app/models/comment.rb:194 +#: app/models/comment.rb:198 msgid "[%s] %s commented on a content of %s" msgstr "" @@ -1922,7 +1910,7 @@ msgstr "" msgid "cyclical reference is not allowed." msgstr "" -#: app/models/article.rb:170 app/models/organization.rb:99 +#: app/models/article.rb:170 app/models/organization.rb:101 msgid "Tag list" msgstr "" @@ -1950,59 +1938,59 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/article.rb:605 +#: app/models/article.rb:609 msgid "no comments" msgstr "" -#: app/models/article.rb:606 +#: app/models/article.rb:610 msgid "one comment" msgstr "" -#: app/models/article.rb:607 +#: app/models/article.rb:611 msgid "%s comments" msgstr "" -#: app/models/article.rb:614 +#: app/models/article.rb:618 msgid "no views" msgstr "" -#: app/models/article.rb:615 +#: app/models/article.rb:619 msgid "one view" msgstr "" -#: app/models/article.rb:616 +#: app/models/article.rb:620 msgid "%s views" msgstr "" -#: app/models/article.rb:621 +#: app/models/article.rb:625 msgid "Created at: " msgstr "" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Published date" msgstr "" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Older than one year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last month" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last week" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last day" msgstr "" -#: app/models/article.rb:707 app/helpers/application_helper.rb:614 +#: app/models/article.rb:711 app/helpers/application_helper.rb:614 #: app/views/search/_article_categories.rhtml:2 #: app/views/categories/index.rhtml:1 app/views/admin_panel/index.rhtml:41 #: app/views/content_viewer/view_page.rhtml:77 @@ -2285,15 +2273,19 @@ msgstr "" msgid "Redirects the user to his control panel." msgstr "" -#: app/models/environment.rb:579 +#: app/models/environment.rb:238 +msgid "This enterprise needs to be enabled." +msgstr "" + +#: app/models/environment.rb:580 msgid "Only one Virtual Community can be the default one" msgstr "" -#: app/models/environment.rb:842 +#: app/models/environment.rb:843 msgid "is not available." msgstr "" -#: app/models/environment.rb:850 +#: app/models/environment.rb:851 msgid "have unsupported languages." msgstr "" @@ -2522,9 +2514,9 @@ msgstr "" msgid "Feed title" msgstr "" -#: app/models/external_feed.rb:- app/models/person.rb:266 -#: app/models/person.rb:277 app/models/organization.rb:121 -#: app/models/organization.rb:132 app/models/blog.rb:13 app/models/blog.rb:17 +#: app/models/external_feed.rb:- app/models/person.rb:269 +#: app/models/person.rb:280 app/models/organization.rb:123 +#: app/models/organization.rb:134 app/models/blog.rb:13 app/models/blog.rb:17 #: app/models/enterprise.rb:129 app/models/enterprise.rb:145 msgid "Blog" msgstr "" @@ -2620,8 +2612,8 @@ msgstr "" msgid "Restrictions" msgstr "" -#: app/models/validation_info.rb:- app/models/person.rb:195 -#: app/views/profile_editor/_person_form.rhtml:60 +#: app/models/validation_info.rb:- app/models/person.rb:198 +#: app/views/profile_editor/_person_form.rhtml:62 msgid "Organization" msgstr "" @@ -2657,108 +2649,123 @@ msgstr "" msgid "family" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:14 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:14 msgid "Cell phone" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:15 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:15 msgid "Comercial phone" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:18 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:18 msgid "Nationality" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:27 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:29 msgid "Schooling" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:52 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:54 msgid "Area of study" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:59 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:61 msgid "Professional activity" msgstr "" -#: app/models/person.rb:195 app/models/enterprise.rb:23 -#: app/views/profile_editor/_person_form.rhtml:61 +#: app/models/person.rb:198 app/models/enterprise.rb:23 +#: app/views/profile_editor/_person_form.rhtml:63 msgid "Organization website" msgstr "" -#: app/models/person.rb:198 +#: app/models/person.rb:201 msgid "Schooling status" msgstr "" -#: app/models/person.rb:201 app/helpers/profile_editor_helper.rb:26 -#: app/views/profile_editor/_person_form.rhtml:45 +#: app/models/person.rb:204 app/helpers/profile_editor_helper.rb:26 +#: app/views/profile_editor/_person_form.rhtml:47 msgid "Education" msgstr "" -#: app/models/person.rb:201 +#: app/models/person.rb:204 msgid "Custom education" msgstr "" -#: app/models/person.rb:201 app/views/profile_editor/_person_form.rhtml:55 +#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:57 msgid "Custom area of study" msgstr "" -#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:12 +#: app/models/person.rb:207 app/views/profile_editor/_person_form.rhtml:12 msgid "Contact information" msgstr "" -#: app/models/person.rb:204 app/models/enterprise.rb:23 +#: app/models/person.rb:207 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:9 -#: app/views/shared/_organization_custom_fields.rhtml:16 +#: app/views/shared/_organization_custom_fields.rhtml:18 #: app/views/profile_editor/_person_form.rhtml:19 #: plugins/bsc/views/shared/_fields.html.erb:65 msgid "Country" msgstr "" -#: app/models/person.rb:204 +#: app/models/person.rb:207 msgid "Sex" msgstr "" -#: app/models/person.rb:204 +#: app/models/person.rb:207 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 msgid "Zip code" msgstr "" -#: app/models/person.rb:235 +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:14 +#: app/views/profile_editor/_person_form.rhtml:25 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17 +msgid "District" +msgstr "" + +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/profile_editor/_person_form.rhtml:24 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16 +msgid "Address reference" +msgstr "" + +#: app/models/person.rb:238 msgid "%{fn} is already used by other user" msgstr "" -#: app/models/person.rb:264 app/models/organization.rb:120 +#: app/models/person.rb:267 app/models/organization.rb:122 msgid "Image gallery" msgstr "" -#: app/models/person.rb:265 app/models/organization.rb:119 +#: app/models/person.rb:268 app/models/organization.rb:121 #: app/helpers/application_helper.rb:532 app/helpers/application_helper.rb:541 msgid "Agenda" msgstr "" -#: app/models/person.rb:278 app/models/gallery.rb:4 app/models/gallery.rb:8 -#: app/models/organization.rb:133 app/views/search/_uploaded_file.rhtml:14 +#: app/models/person.rb:281 app/models/gallery.rb:4 app/models/gallery.rb:8 +#: app/models/organization.rb:135 app/views/search/_uploaded_file.rhtml:14 msgid "Gallery" msgstr "" -#: app/models/person.rb:390 +#: app/models/person.rb:393 msgid "none" msgstr "" -#: app/models/person.rb:391 +#: app/models/person.rb:394 msgid "one friend" msgstr "" -#: app/models/person.rb:392 +#: app/models/person.rb:395 msgid "%s friends" msgstr "" -#: app/models/person.rb:427 +#: app/models/person.rb:430 msgid "You just left %s." msgstr "" -#: app/models/person.rb:451 app/models/profile.rb:868 +#: app/models/person.rb:454 app/models/profile.rb:876 msgid "Edit Profile" msgstr "" @@ -2846,63 +2853,63 @@ msgstr "" msgid "Send e-Mail to members" msgstr "" -#: app/models/profile.rb:301 +#: app/models/profile.rb:305 msgid "is not a template." msgstr "" -#: app/models/profile.rb:613 +#: app/models/profile.rb:621 msgid "%s can't have members" msgstr "" -#: app/models/profile.rb:634 +#: app/models/profile.rb:642 msgid "%s can't has moderators" msgstr "" -#: app/models/profile.rb:715 +#: app/models/profile.rb:723 msgid "Private profile" msgstr "" -#: app/models/profile.rb:812 +#: app/models/profile.rb:820 msgid "Since: " msgstr "" -#: app/models/profile.rb:827 +#: app/models/profile.rb:835 msgid "no activity" msgstr "" -#: app/models/profile.rb:828 +#: app/models/profile.rb:836 msgid "one activity" msgstr "" -#: app/models/profile.rb:829 +#: app/models/profile.rb:837 msgid "%s activities" msgstr "" -#: app/models/profile.rb:835 +#: app/models/profile.rb:843 msgid "no members" msgstr "" -#: app/models/profile.rb:836 +#: app/models/profile.rb:844 msgid "one member" msgstr "" -#: app/models/profile.rb:837 +#: app/models/profile.rb:845 msgid "%s members" msgstr "" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 msgid "facets|Enabled" msgstr "" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 msgid "facets|Not enabled" msgstr "" -#: app/models/profile.rb:940 +#: app/models/profile.rb:948 msgid "Situation" msgstr "" -#: app/models/profile.rb:970 +#: app/models/profile.rb:978 msgid "Profile Info and settings" msgstr "" @@ -2942,7 +2949,7 @@ msgstr "" msgid "Certifier" msgstr "" -#: app/models/unit.rb:- app/views/catalog/index.rhtml:37 +#: app/models/unit.rb:- app/views/catalog/index.rhtml:59 msgid "unit" msgstr "" @@ -3331,23 +3338,23 @@ msgstr "" msgid "profilecategorization" msgstr "" -#: app/models/create_enterprise.rb:7 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:101 msgid "Contact person" msgstr "" -#: app/models/create_enterprise.rb:9 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:101 msgid "Foundation year" msgstr "" -#: app/models/create_enterprise.rb:10 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:101 msgid "Legal form" msgstr "" -#: app/models/create_enterprise.rb:11 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:101 msgid "Economic activity" msgstr "" -#: app/models/create_enterprise.rb:12 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:101 msgid "Management information" msgstr "" @@ -3462,15 +3469,15 @@ msgstr "" msgid " is inviting you to join \"\" on ." msgstr "" -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 msgid "Display name" msgstr "" -#: app/models/organization.rb:117 +#: app/models/organization.rb:119 msgid "Community's profile" msgstr "" -#: app/models/organization.rb:118 +#: app/models/organization.rb:120 msgid "Invite Friends" msgstr "" @@ -3568,9 +3575,9 @@ msgid "Activities short description" msgstr "" #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:12 -#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/shared/_organization_custom_fields.rhtml:15 #: app/views/profile_editor/_person_form.rhtml:22 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:13 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:19 msgid "ZIP code" msgstr "" @@ -4176,11 +4183,11 @@ msgstr "" msgid "Sign out of chat" msgstr "" -#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:12 +#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:20 msgid "No product" msgstr "" -#: app/helpers/display_helper.rb:59 +#: app/helpers/display_helper.rb:67 msgid "Are you sure you want to visit this web site?" msgstr "" @@ -4456,7 +4463,7 @@ msgstr "" msgid "Source: %s" msgstr "" -#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:17 +#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:39 #: app/views/search/_image.rhtml:43 app/views/cms/_text_editor_sidebar.rhtml:3 #: app/views/manage_products/_display_image.rhtml:6 msgid "Zoom in" @@ -4509,6 +4516,14 @@ msgstr "" msgid "Type in a search term" msgstr "" +#: app/helpers/application_helper.rb:1418 +msgid "The content here is available to %s's friends only." +msgstr "" + +#: app/helpers/application_helper.rb:1421 +msgid "The contents in this community is available to members only." +msgstr "" + #: app/helpers/events_helper.rb:4 msgid "Select a day on the left to display it's events here" msgstr "" @@ -4664,6 +4679,10 @@ msgstr "" msgid "Delete" msgstr "" +#: app/helpers/catalog_helper.rb:7 +msgid "Start" +msgstr "" + #: app/helpers/blog_helper.rb:10 msgid "New post" msgstr "" @@ -5347,49 +5366,57 @@ msgstr "" msgid "I want to receive a copy of the message in my e-mail." msgstr "" -#: app/views/catalog/index.rhtml:5 app/views/blocks/profile_info.rhtml:21 +#: app/views/catalog/index.rhtml:4 app/views/blocks/profile_info.rhtml:21 #: app/views/profile/_organization_profile.rhtml:26 msgid "Products/Services" msgstr "" -#: app/views/catalog/index.rhtml:20 app/views/search/_image.rhtml:35 +#: app/views/catalog/index.rhtml:16 +msgid "There are no sub-categories for %s" +msgstr "" + +#: app/views/catalog/index.rhtml:34 +msgid "Highlighted product" +msgstr "" + +#: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35 #: app/views/search/_image.rhtml:47 msgid "No image" msgstr "" -#: app/views/catalog/index.rhtml:30 +#: app/views/catalog/index.rhtml:52 msgid "from " msgstr "" -#: app/views/catalog/index.rhtml:31 +#: app/views/catalog/index.rhtml:53 msgid "by " msgstr "" -#: app/views/catalog/index.rhtml:37 +#: app/views/catalog/index.rhtml:59 msgid " / " msgstr "" -#: app/views/catalog/index.rhtml:45 +#: app/views/catalog/index.rhtml:67 msgid "description" msgstr "" -#: app/views/catalog/index.rhtml:55 +#: app/views/catalog/index.rhtml:77 msgid "price composition" msgstr "" -#: app/views/catalog/index.rhtml:78 +#: app/views/catalog/index.rhtml:100 msgid "inputs and raw materials" msgstr "" -#: app/views/catalog/index.rhtml:84 +#: app/views/catalog/index.rhtml:106 msgid "%{amount_used} %{unit} of" msgstr "" -#: app/views/catalog/index.rhtml:95 +#: app/views/catalog/index.rhtml:117 msgid "qualifiers" msgstr "" -#: app/views/catalog/index.rhtml:103 +#: app/views/catalog/index.rhtml:125 msgid "product unavailable" msgstr "" @@ -5469,7 +5496,7 @@ msgstr "" #: app/views/profile_editor/edit.rhtml:64 app/views/cms/view.rhtml:9 #: app/views/tasks/index.rhtml:37 app/views/tasks/index.rhtml:62 #: app/views/box_organizer/index.rhtml:5 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:43 msgid "Back to control panel" msgstr "" @@ -5631,7 +5658,7 @@ msgstr "" #: app/views/maps/edit_location.rhtml:13 #: app/views/shared/_organization_custom_fields.rhtml:12 #: app/views/profile_editor/_person_form.rhtml:23 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15 msgid "Address (street and number)" msgstr "" @@ -6060,22 +6087,18 @@ msgid "Supplier" msgstr "" #: app/views/search/index.rhtml:7 app/views/search/category_index.rhtml:7 -#: plugins/solr/views/solr_plugin_public/index.rhtml:7 msgid "Search Results" msgstr "" #: app/views/search/index.rhtml:14 app/views/search/category_index.rhtml:14 -#: plugins/solr/views/solr_plugin_public/index.rhtml:14 msgid "Sub-categories" msgstr "" #: app/views/search/index.rhtml:16 app/views/search/category_index.rhtml:16 -#: plugins/solr/views/solr_plugin_public/index.rhtml:16 msgid "No sub-categories" msgstr "" #: app/views/search/_facets_unselect_menu.rhtml:3 -#: plugins/solr/views/search/_facets_unselect_menu.rhtml:3 msgid "Applied filters" msgstr "" @@ -6936,7 +6959,7 @@ msgstr "" msgid "Home phone" msgstr "" -#: app/views/profile_editor/_person_form.rhtml:48 +#: app/views/profile_editor/_person_form.rhtml:50 msgid "Custom formation" msgstr "" @@ -9640,7 +9663,7 @@ msgid "[%s] Bsc management transferred to you." msgstr "" #: plugins/bsc/lib/bsc_plugin/contract.rb:33 -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Opened" msgstr "" @@ -9871,92 +9894,101 @@ msgstr "" msgid "The tolerance time for editing this content is over." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:10 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:13 msgid "Option updated successfully." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:12 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:15 msgid "Option wasn't updated successfully." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:98 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:116 msgid "Request sent successfully. Check your email." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:121 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:139 msgid "Basket displayed." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:140 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:158 msgid "Basket hidden." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:162 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:186 +msgid "Delivery option updated." +msgstr "" + +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:199 msgid "Can't join items from different enterprises." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:176 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:213 msgid "There is no basket." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:192 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:229 msgid "This enterprise doesn't have this product." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:206 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:243 msgid "The basket doesn't have this product." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:220 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:257 msgid "Invalid quantity." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:11 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:12 msgid "A shopping basket feature for enterprises" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:17 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:37 msgid "Add to basket" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:44 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:65 msgid "Shopping basket" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:47 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:68 msgid "Purchase reports" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:8 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:10 msgid "[%s] Your buy request was performed successfully." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:21 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:25 msgid "[%s] You have a new buy request from %s." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:22 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41 +msgid "Free delivery" +msgstr "" + +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7 msgid "Delivery" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:35 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53 msgid "Item name" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:52 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76 #: plugins/shopping_cart/views/cart.html.erb:9 msgid "Total:" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Canceled" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Confirmed" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Shipped" msgstr "" @@ -10754,6 +10786,25 @@ msgstr "" msgid "E-mail" msgstr "" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9 +msgid "Delivery option" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Payment" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 +msgid "Change" +msgstr "" + #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:1 msgid "Basket options" msgstr "" @@ -10762,8 +10813,26 @@ msgstr "" msgid "Delivery?" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:6 -msgid "Delivery price:" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +msgid "Option" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:24 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:32 +msgid "Remove option" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:27 +msgid "ADD NEW OPTION" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 +msgid "Free delivery price:" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 +msgid "Empty stands for no free delivery price." msgstr "" #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10 @@ -10789,16 +10858,28 @@ msgstr "" msgid "Phone number" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:37 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Money" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Check" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47 msgid "Here are the products you bought:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51 msgid "Thanks for buying with us!" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:45 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51 msgid "A service of %s." msgstr "" @@ -10810,23 +10891,23 @@ msgstr "" msgid "Below follows the customer informations:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45 msgid "And here are the items bought by this customer:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:40 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49 msgid "If there are any problems with this email contact the admin of %s." msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:14 msgid "Delivery Address" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:23 msgid "Send buy request" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/send_request.html.erb:1 +#: plugins/shopping_cart/views/shopping_cart_plugin/send_request.html.erb:1 msgid "Request sent successfully check your email." msgstr "" diff --git a/po/noosfero.pot b/po/noosfero.pot index 5c75f77..10953a9 100644 --- a/po/noosfero.pot +++ b/po/noosfero.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.39.1\n" -"POT-Creation-Date: 2013-01-03 20:39-0000\n" +"Project-Id-Version: noosfero 0.39.3\n" +"POT-Creation-Date: 2013-01-19 21:42-0000\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,29 +28,31 @@ msgstr "" msgid "Please enter a valid email address." msgstr "" -#: app/controllers/public/content_viewer_controller.rb:38 -msgid "" -"You are not allowed to view this content. You can contact the owner of this " -"profile to request access then." +#: app/controllers/public/content_viewer_controller.rb:35 +msgid "You are not allowed to view this content." +msgstr "" + +#: app/controllers/public/content_viewer_controller.rb:36 +msgid "You can contact the owner of this profile to request access then." msgstr "" -#: app/controllers/public/content_viewer_controller.rb:114 +#: app/controllers/public/content_viewer_controller.rb:116 msgid "Notification of new comments to '%s' was successfully canceled" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:135 +#: app/controllers/public/content_viewer_controller.rb:137 msgid "Comment succesfully updated" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:138 +#: app/controllers/public/content_viewer_controller.rb:140 msgid "Comment could not be updated" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:143 +#: app/controllers/public/content_viewer_controller.rb:145 msgid "Could not find the comment in the article" msgstr "" -#: app/controllers/public/content_viewer_controller.rb:157 +#: app/controllers/public/content_viewer_controller.rb:159 #: app/controllers/my_profile/cms_controller.rb:264 msgid "Please type the words correctly" msgstr "" @@ -62,7 +64,6 @@ msgstr "" #: app/controllers/public/search_controller.rb:151 #: app/models/people_block.rb:4 app/helpers/application_helper.rb:1097 #: app/helpers/assets_helper.rb:8 app/helpers/search_helper.rb:13 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:34 msgid "People" msgstr "" @@ -70,7 +71,6 @@ msgstr "" #: app/models/enterprises_block.rb:12 app/helpers/assets_helper.rb:10 #: app/helpers/search_helper.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/profile/_person_profile.rhtml:23 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:35 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:13 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:18 msgid "Enterprises" @@ -80,13 +80,11 @@ msgstr "" #: app/models/products_block.rb:8 app/models/products_block.rb:12 #: app/models/enterprise.rb:130 app/helpers/application_helper.rb:539 #: app/helpers/assets_helper.rb:9 app/views/search/_sellers_form.rhtml:8 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:36 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:22 msgid "Products" msgstr "" #: app/controllers/public/search_controller.rb:154 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:37 msgid "Upcoming events" msgstr "" @@ -94,13 +92,11 @@ msgstr "" #: app/models/communities_block.rb:4 app/helpers/application_helper.rb:524 #: app/helpers/application_helper.rb:1113 app/helpers/assets_helper.rb:11 #: app/helpers/search_helper.rb:14 app/views/profile/_person_profile.rhtml:41 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:38 msgid "Communities" msgstr "" #: app/controllers/public/search_controller.rb:156 #: app/helpers/application_helper.rb:1081 app/helpers/search_helper.rb:11 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:39 msgid "Contents" msgstr "" @@ -240,21 +236,13 @@ msgstr "" msgid "Could not create the e-mail" msgstr "" -#: app/controllers/public/profile_controller.rb:373 -msgid "The content here is available to %s's friends only." -msgstr "" - #: app/controllers/public/profile_controller.rb:376 -msgid "The contents in this community is available to members only." -msgstr "" - -#: app/controllers/public/profile_controller.rb:383 msgid "" "This profile is inaccessible. You don't have the permission to view the " "content here." msgstr "" -#: app/controllers/public/profile_controller.rb:383 +#: app/controllers/public/profile_controller.rb:376 msgid "Oops ... you cannot go ahead here" msgstr "" @@ -500,7 +488,7 @@ msgstr "" #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:23 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:6 msgid "Name" msgstr "" @@ -732,7 +720,7 @@ msgstr "" msgid "profile" msgstr "" -#: app/models/product.rb:- app/models/article.rb:702 app/models/mailing.rb:- +#: app/models/product.rb:- app/models/article.rb:706 app/models/mailing.rb:- #: app/views/cms/view.rhtml:25 #: app/views/shared/reported_versions/_article.html.erb:3 #: app/views/shared/reported_versions/_comment.html.erb:3 @@ -772,15 +760,15 @@ msgstr "" #: app/views/box_organizer/_link_list_block.rhtml:4 #: plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb:12 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:19 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:25 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:23 msgid "Address" msgstr "" #: app/models/product.rb:- app/models/create_enterprise.rb:6 #: app/views/profile_editor/_person_form.rhtml:13 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:8 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:8 msgid "Contact phone" msgstr "" @@ -830,7 +818,7 @@ msgstr "" msgid "Theme" msgstr "" -#: app/models/product.rb:- app/models/profile.rb:715 +#: app/models/product.rb:- app/models/profile.rb:723 msgid "Public profile" msgstr "" @@ -936,7 +924,7 @@ msgid "Abstract" msgstr "" #: app/models/product.rb:- app/models/action_tracker_notification.rb:- -#: app/models/article.rb:706 app/models/person.rb:263 app/models/profile.rb:9 +#: app/models/article.rb:710 app/models/person.rb:266 app/models/profile.rb:9 #: app/models/profile_categorization.rb:- app/views/profile/index.rhtml:28 #: app/views/profile/index.rhtml:33 msgid "Profile" @@ -1115,7 +1103,7 @@ msgstr "" msgid "environment" msgstr "" -#: app/models/product.rb:- app/models/organization.rb:99 +#: app/models/product.rb:- app/models/organization.rb:101 #: app/views/admin_panel/_site_info.rhtml:2 msgid "Contact email" msgstr "" @@ -1179,12 +1167,13 @@ msgstr "" #: app/models/product.rb:- app/models/price_detail.rb:- #: app/views/manage_products/index.rhtml:6 -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:37 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:55 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 msgid "Price" msgstr "" #: app/models/product.rb:- app/models/certifier.rb:- -#: app/models/organization.rb:99 app/views/search/_product.rhtml:52 +#: app/models/organization.rb:101 app/views/search/_product.rhtml:52 #: app/views/search/_article_description.rhtml:4 #: app/views/profile_editor/_person_form.rhtml:10 #: app/views/cms/_uploaded_file.rhtml:5 @@ -1254,7 +1243,7 @@ msgstr "" #: app/views/cms/suggest_an_article.rhtml:17 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:18 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:16 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:7 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:7 msgid "Email" msgstr "" @@ -1352,7 +1341,7 @@ msgid "Accept products" msgstr "" #: app/models/product.rb:- app/models/create_enterprise.rb:8 -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 #: app/views/enterprise_validation/_details.rhtml:19 msgid "Acronym" msgstr "" @@ -1378,51 +1367,51 @@ msgstr "" msgid "Fetched at" msgstr "" -#: app/models/product.rb:76 app/helpers/display_helper.rb:34 -#: app/helpers/display_helper.rb:43 +#: app/models/product.rb:80 app/helpers/display_helper.rb:42 +#: app/helpers/display_helper.rb:51 msgid "Uncategorized product" msgstr "" -#: app/models/product.rb:206 +#: app/models/product.rb:210 msgid "0%" msgstr "" -#: app/models/product.rb:207 +#: app/models/product.rb:211 msgid "25%" msgstr "" -#: app/models/product.rb:208 +#: app/models/product.rb:212 msgid "50%" msgstr "" -#: app/models/product.rb:209 +#: app/models/product.rb:213 msgid "75%" msgstr "" -#: app/models/product.rb:210 +#: app/models/product.rb:214 msgid "100%" msgstr "" -#: app/models/product.rb:234 +#: app/models/product.rb:238 msgid " cert. " msgstr "" -#: app/models/product.rb:259 +#: app/models/product.rb:263 msgid "Related products" msgstr "" -#: app/models/product.rb:260 app/models/contact.rb:- app/models/person.rb:204 -#: app/models/profile.rb:942 app/models/enterprise.rb:23 +#: app/models/product.rb:264 app/models/contact.rb:- app/models/person.rb:207 +#: app/models/profile.rb:950 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:11 app/views/search/_product.rhtml:59 #: app/views/search/_profile.rhtml:21 #: app/views/profile_editor/_person_form.rhtml:21 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:10 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:12 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:18 msgid "City" msgstr "" -#: app/models/product.rb:261 app/views/search/_product.rhtml:65 +#: app/models/product.rb:265 app/views/search/_product.rhtml:65 msgid "Qualifiers" msgstr "" @@ -1488,7 +1477,7 @@ msgstr "" #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:16 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:52 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:42 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:25 msgid "Save" msgstr "" @@ -1584,7 +1573,6 @@ msgstr "" #: app/views/search/_search_form.rhtml:24 #: app/views/cms/_text_editor_sidebar.rhtml:36 app/views/home/index.rhtml:61 #: app/views/profile_members/_add_admins.rhtml:5 -#: plugins/solr/views/search/_search_form.rhtml:24 msgid "Search" msgstr "" @@ -1793,7 +1781,7 @@ msgstr "" msgid "Message" msgstr "" -#: app/models/contact.rb:- app/models/person.rb:204 +#: app/models/contact.rb:- app/models/person.rb:207 #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:10 #: app/views/profile_editor/_person_form.rhtml:20 #: plugins/bsc/lib/bsc_plugin/contract.rb:46 @@ -1826,11 +1814,11 @@ msgstr "" msgid "(unauthenticated user)" msgstr "" -#: app/models/comment.rb:179 +#: app/models/comment.rb:183 msgid "[%s] you got a new comment!" msgstr "" -#: app/models/comment.rb:194 +#: app/models/comment.rb:198 msgid "[%s] %s commented on a content of %s" msgstr "" @@ -1922,7 +1910,7 @@ msgstr "" msgid "cyclical reference is not allowed." msgstr "" -#: app/models/article.rb:170 app/models/organization.rb:99 +#: app/models/article.rb:170 app/models/organization.rb:101 msgid "Tag list" msgstr "" @@ -1950,59 +1938,59 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/article.rb:605 +#: app/models/article.rb:609 msgid "no comments" msgstr "" -#: app/models/article.rb:606 +#: app/models/article.rb:610 msgid "one comment" msgstr "" -#: app/models/article.rb:607 +#: app/models/article.rb:611 msgid "%s comments" msgstr "" -#: app/models/article.rb:614 +#: app/models/article.rb:618 msgid "no views" msgstr "" -#: app/models/article.rb:615 +#: app/models/article.rb:619 msgid "one view" msgstr "" -#: app/models/article.rb:616 +#: app/models/article.rb:620 msgid "%s views" msgstr "" -#: app/models/article.rb:621 +#: app/models/article.rb:625 msgid "Created at: " msgstr "" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Published date" msgstr "" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Older than one year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last month" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last week" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last day" msgstr "" -#: app/models/article.rb:707 app/helpers/application_helper.rb:614 +#: app/models/article.rb:711 app/helpers/application_helper.rb:614 #: app/views/search/_article_categories.rhtml:2 #: app/views/categories/index.rhtml:1 app/views/admin_panel/index.rhtml:41 #: app/views/content_viewer/view_page.rhtml:77 @@ -2285,15 +2273,19 @@ msgstr "" msgid "Redirects the user to his control panel." msgstr "" -#: app/models/environment.rb:579 +#: app/models/environment.rb:238 +msgid "This enterprise needs to be enabled." +msgstr "" + +#: app/models/environment.rb:580 msgid "Only one Virtual Community can be the default one" msgstr "" -#: app/models/environment.rb:842 +#: app/models/environment.rb:843 msgid "is not available." msgstr "" -#: app/models/environment.rb:850 +#: app/models/environment.rb:851 msgid "have unsupported languages." msgstr "" @@ -2522,9 +2514,9 @@ msgstr "" msgid "Feed title" msgstr "" -#: app/models/external_feed.rb:- app/models/person.rb:266 -#: app/models/person.rb:277 app/models/organization.rb:121 -#: app/models/organization.rb:132 app/models/blog.rb:13 app/models/blog.rb:17 +#: app/models/external_feed.rb:- app/models/person.rb:269 +#: app/models/person.rb:280 app/models/organization.rb:123 +#: app/models/organization.rb:134 app/models/blog.rb:13 app/models/blog.rb:17 #: app/models/enterprise.rb:129 app/models/enterprise.rb:145 msgid "Blog" msgstr "" @@ -2620,8 +2612,8 @@ msgstr "" msgid "Restrictions" msgstr "" -#: app/models/validation_info.rb:- app/models/person.rb:195 -#: app/views/profile_editor/_person_form.rhtml:60 +#: app/models/validation_info.rb:- app/models/person.rb:198 +#: app/views/profile_editor/_person_form.rhtml:62 msgid "Organization" msgstr "" @@ -2657,108 +2649,123 @@ msgstr "" msgid "family" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:14 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:14 msgid "Cell phone" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:15 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:15 msgid "Comercial phone" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:18 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:18 msgid "Nationality" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:27 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:29 msgid "Schooling" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:52 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:54 msgid "Area of study" msgstr "" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:59 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:61 msgid "Professional activity" msgstr "" -#: app/models/person.rb:195 app/models/enterprise.rb:23 -#: app/views/profile_editor/_person_form.rhtml:61 +#: app/models/person.rb:198 app/models/enterprise.rb:23 +#: app/views/profile_editor/_person_form.rhtml:63 msgid "Organization website" msgstr "" -#: app/models/person.rb:198 +#: app/models/person.rb:201 msgid "Schooling status" msgstr "" -#: app/models/person.rb:201 app/helpers/profile_editor_helper.rb:26 -#: app/views/profile_editor/_person_form.rhtml:45 +#: app/models/person.rb:204 app/helpers/profile_editor_helper.rb:26 +#: app/views/profile_editor/_person_form.rhtml:47 msgid "Education" msgstr "" -#: app/models/person.rb:201 +#: app/models/person.rb:204 msgid "Custom education" msgstr "" -#: app/models/person.rb:201 app/views/profile_editor/_person_form.rhtml:55 +#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:57 msgid "Custom area of study" msgstr "" -#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:12 +#: app/models/person.rb:207 app/views/profile_editor/_person_form.rhtml:12 msgid "Contact information" msgstr "" -#: app/models/person.rb:204 app/models/enterprise.rb:23 +#: app/models/person.rb:207 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:9 -#: app/views/shared/_organization_custom_fields.rhtml:16 +#: app/views/shared/_organization_custom_fields.rhtml:18 #: app/views/profile_editor/_person_form.rhtml:19 #: plugins/bsc/views/shared/_fields.html.erb:65 msgid "Country" msgstr "" -#: app/models/person.rb:204 +#: app/models/person.rb:207 msgid "Sex" msgstr "" -#: app/models/person.rb:204 +#: app/models/person.rb:207 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 msgid "Zip code" msgstr "" -#: app/models/person.rb:235 +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:14 +#: app/views/profile_editor/_person_form.rhtml:25 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17 +msgid "District" +msgstr "" + +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/profile_editor/_person_form.rhtml:24 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16 +msgid "Address reference" +msgstr "" + +#: app/models/person.rb:238 msgid "%{fn} is already used by other user" msgstr "" -#: app/models/person.rb:264 app/models/organization.rb:120 +#: app/models/person.rb:267 app/models/organization.rb:122 msgid "Image gallery" msgstr "" -#: app/models/person.rb:265 app/models/organization.rb:119 +#: app/models/person.rb:268 app/models/organization.rb:121 #: app/helpers/application_helper.rb:532 app/helpers/application_helper.rb:541 msgid "Agenda" msgstr "" -#: app/models/person.rb:278 app/models/gallery.rb:4 app/models/gallery.rb:8 -#: app/models/organization.rb:133 app/views/search/_uploaded_file.rhtml:14 +#: app/models/person.rb:281 app/models/gallery.rb:4 app/models/gallery.rb:8 +#: app/models/organization.rb:135 app/views/search/_uploaded_file.rhtml:14 msgid "Gallery" msgstr "" -#: app/models/person.rb:390 +#: app/models/person.rb:393 msgid "none" msgstr "" -#: app/models/person.rb:391 +#: app/models/person.rb:394 msgid "one friend" msgstr "" -#: app/models/person.rb:392 +#: app/models/person.rb:395 msgid "%s friends" msgstr "" -#: app/models/person.rb:427 +#: app/models/person.rb:430 msgid "You just left %s." msgstr "" -#: app/models/person.rb:451 app/models/profile.rb:868 +#: app/models/person.rb:454 app/models/profile.rb:876 msgid "Edit Profile" msgstr "" @@ -2846,63 +2853,63 @@ msgstr "" msgid "Send e-Mail to members" msgstr "" -#: app/models/profile.rb:301 +#: app/models/profile.rb:305 msgid "is not a template." msgstr "" -#: app/models/profile.rb:613 +#: app/models/profile.rb:621 msgid "%s can't have members" msgstr "" -#: app/models/profile.rb:634 +#: app/models/profile.rb:642 msgid "%s can't has moderators" msgstr "" -#: app/models/profile.rb:715 +#: app/models/profile.rb:723 msgid "Private profile" msgstr "" -#: app/models/profile.rb:812 +#: app/models/profile.rb:820 msgid "Since: " msgstr "" -#: app/models/profile.rb:827 +#: app/models/profile.rb:835 msgid "no activity" msgstr "" -#: app/models/profile.rb:828 +#: app/models/profile.rb:836 msgid "one activity" msgstr "" -#: app/models/profile.rb:829 +#: app/models/profile.rb:837 msgid "%s activities" msgstr "" -#: app/models/profile.rb:835 +#: app/models/profile.rb:843 msgid "no members" msgstr "" -#: app/models/profile.rb:836 +#: app/models/profile.rb:844 msgid "one member" msgstr "" -#: app/models/profile.rb:837 +#: app/models/profile.rb:845 msgid "%s members" msgstr "" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 msgid "facets|Enabled" msgstr "" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 msgid "facets|Not enabled" msgstr "" -#: app/models/profile.rb:940 +#: app/models/profile.rb:948 msgid "Situation" msgstr "" -#: app/models/profile.rb:970 +#: app/models/profile.rb:978 msgid "Profile Info and settings" msgstr "" @@ -2942,7 +2949,7 @@ msgstr "" msgid "Certifier" msgstr "" -#: app/models/unit.rb:- app/views/catalog/index.rhtml:37 +#: app/models/unit.rb:- app/views/catalog/index.rhtml:59 msgid "unit" msgstr "" @@ -3331,23 +3338,23 @@ msgstr "" msgid "profilecategorization" msgstr "" -#: app/models/create_enterprise.rb:7 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:101 msgid "Contact person" msgstr "" -#: app/models/create_enterprise.rb:9 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:101 msgid "Foundation year" msgstr "" -#: app/models/create_enterprise.rb:10 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:101 msgid "Legal form" msgstr "" -#: app/models/create_enterprise.rb:11 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:101 msgid "Economic activity" msgstr "" -#: app/models/create_enterprise.rb:12 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:101 msgid "Management information" msgstr "" @@ -3462,15 +3469,15 @@ msgstr "" msgid " is inviting you to join \"\" on ." msgstr "" -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 msgid "Display name" msgstr "" -#: app/models/organization.rb:117 +#: app/models/organization.rb:119 msgid "Community's profile" msgstr "" -#: app/models/organization.rb:118 +#: app/models/organization.rb:120 msgid "Invite Friends" msgstr "" @@ -3568,9 +3575,9 @@ msgid "Activities short description" msgstr "" #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:12 -#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/shared/_organization_custom_fields.rhtml:15 #: app/views/profile_editor/_person_form.rhtml:22 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:13 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:19 msgid "ZIP code" msgstr "" @@ -4176,11 +4183,11 @@ msgstr "" msgid "Sign out of chat" msgstr "" -#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:12 +#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:20 msgid "No product" msgstr "" -#: app/helpers/display_helper.rb:59 +#: app/helpers/display_helper.rb:67 msgid "Are you sure you want to visit this web site?" msgstr "" @@ -4456,7 +4463,7 @@ msgstr "" msgid "Source: %s" msgstr "" -#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:17 +#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:39 #: app/views/search/_image.rhtml:43 app/views/cms/_text_editor_sidebar.rhtml:3 #: app/views/manage_products/_display_image.rhtml:6 msgid "Zoom in" @@ -4509,6 +4516,14 @@ msgstr "" msgid "Type in a search term" msgstr "" +#: app/helpers/application_helper.rb:1418 +msgid "The content here is available to %s's friends only." +msgstr "" + +#: app/helpers/application_helper.rb:1421 +msgid "The contents in this community is available to members only." +msgstr "" + #: app/helpers/events_helper.rb:4 msgid "Select a day on the left to display it's events here" msgstr "" @@ -4664,6 +4679,10 @@ msgstr "" msgid "Delete" msgstr "" +#: app/helpers/catalog_helper.rb:7 +msgid "Start" +msgstr "" + #: app/helpers/blog_helper.rb:10 msgid "New post" msgstr "" @@ -5347,49 +5366,57 @@ msgstr "" msgid "I want to receive a copy of the message in my e-mail." msgstr "" -#: app/views/catalog/index.rhtml:5 app/views/blocks/profile_info.rhtml:21 +#: app/views/catalog/index.rhtml:4 app/views/blocks/profile_info.rhtml:21 #: app/views/profile/_organization_profile.rhtml:26 msgid "Products/Services" msgstr "" -#: app/views/catalog/index.rhtml:20 app/views/search/_image.rhtml:35 +#: app/views/catalog/index.rhtml:16 +msgid "There are no sub-categories for %s" +msgstr "" + +#: app/views/catalog/index.rhtml:34 +msgid "Highlighted product" +msgstr "" + +#: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35 #: app/views/search/_image.rhtml:47 msgid "No image" msgstr "" -#: app/views/catalog/index.rhtml:30 +#: app/views/catalog/index.rhtml:52 msgid "from " msgstr "" -#: app/views/catalog/index.rhtml:31 +#: app/views/catalog/index.rhtml:53 msgid "by " msgstr "" -#: app/views/catalog/index.rhtml:37 +#: app/views/catalog/index.rhtml:59 msgid " / " msgstr "" -#: app/views/catalog/index.rhtml:45 +#: app/views/catalog/index.rhtml:67 msgid "description" msgstr "" -#: app/views/catalog/index.rhtml:55 +#: app/views/catalog/index.rhtml:77 msgid "price composition" msgstr "" -#: app/views/catalog/index.rhtml:78 +#: app/views/catalog/index.rhtml:100 msgid "inputs and raw materials" msgstr "" -#: app/views/catalog/index.rhtml:84 +#: app/views/catalog/index.rhtml:106 msgid "%{amount_used} %{unit} of" msgstr "" -#: app/views/catalog/index.rhtml:95 +#: app/views/catalog/index.rhtml:117 msgid "qualifiers" msgstr "" -#: app/views/catalog/index.rhtml:103 +#: app/views/catalog/index.rhtml:125 msgid "product unavailable" msgstr "" @@ -5469,7 +5496,7 @@ msgstr "" #: app/views/profile_editor/edit.rhtml:64 app/views/cms/view.rhtml:9 #: app/views/tasks/index.rhtml:37 app/views/tasks/index.rhtml:62 #: app/views/box_organizer/index.rhtml:5 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:43 msgid "Back to control panel" msgstr "" @@ -5631,7 +5658,7 @@ msgstr "" #: app/views/maps/edit_location.rhtml:13 #: app/views/shared/_organization_custom_fields.rhtml:12 #: app/views/profile_editor/_person_form.rhtml:23 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15 msgid "Address (street and number)" msgstr "" @@ -6060,22 +6087,18 @@ msgid "Supplier" msgstr "" #: app/views/search/index.rhtml:7 app/views/search/category_index.rhtml:7 -#: plugins/solr/views/solr_plugin_public/index.rhtml:7 msgid "Search Results" msgstr "" #: app/views/search/index.rhtml:14 app/views/search/category_index.rhtml:14 -#: plugins/solr/views/solr_plugin_public/index.rhtml:14 msgid "Sub-categories" msgstr "" #: app/views/search/index.rhtml:16 app/views/search/category_index.rhtml:16 -#: plugins/solr/views/solr_plugin_public/index.rhtml:16 msgid "No sub-categories" msgstr "" #: app/views/search/_facets_unselect_menu.rhtml:3 -#: plugins/solr/views/search/_facets_unselect_menu.rhtml:3 msgid "Applied filters" msgstr "" @@ -6936,7 +6959,7 @@ msgstr "" msgid "Home phone" msgstr "" -#: app/views/profile_editor/_person_form.rhtml:48 +#: app/views/profile_editor/_person_form.rhtml:50 msgid "Custom formation" msgstr "" @@ -9640,7 +9663,7 @@ msgid "[%s] Bsc management transferred to you." msgstr "" #: plugins/bsc/lib/bsc_plugin/contract.rb:33 -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Opened" msgstr "" @@ -9871,92 +9894,101 @@ msgstr "" msgid "The tolerance time for editing this content is over." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:10 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:13 msgid "Option updated successfully." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:12 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:15 msgid "Option wasn't updated successfully." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:98 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:116 msgid "Request sent successfully. Check your email." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:121 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:139 msgid "Basket displayed." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:140 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:158 msgid "Basket hidden." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:162 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:186 +msgid "Delivery option updated." +msgstr "" + +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:199 msgid "Can't join items from different enterprises." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:176 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:213 msgid "There is no basket." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:192 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:229 msgid "This enterprise doesn't have this product." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:206 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:243 msgid "The basket doesn't have this product." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:220 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:257 msgid "Invalid quantity." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:11 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:12 msgid "A shopping basket feature for enterprises" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:17 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:37 msgid "Add to basket" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:44 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:65 msgid "Shopping basket" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:47 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:68 msgid "Purchase reports" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:8 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:10 msgid "[%s] Your buy request was performed successfully." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:21 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:25 msgid "[%s] You have a new buy request from %s." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:22 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41 +msgid "Free delivery" +msgstr "" + +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7 msgid "Delivery" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:35 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53 msgid "Item name" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:52 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76 #: plugins/shopping_cart/views/cart.html.erb:9 msgid "Total:" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Canceled" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Confirmed" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Shipped" msgstr "" @@ -10754,6 +10786,25 @@ msgstr "" msgid "E-mail" msgstr "" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9 +msgid "Delivery option" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Payment" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 +msgid "Change" +msgstr "" + #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:1 msgid "Basket options" msgstr "" @@ -10762,8 +10813,26 @@ msgstr "" msgid "Delivery?" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:6 -msgid "Delivery price:" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +msgid "Option" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:24 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:32 +msgid "Remove option" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:27 +msgid "ADD NEW OPTION" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 +msgid "Free delivery price:" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 +msgid "Empty stands for no free delivery price." msgstr "" #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10 @@ -10789,16 +10858,28 @@ msgstr "" msgid "Phone number" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:37 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Money" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Check" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47 msgid "Here are the products you bought:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51 msgid "Thanks for buying with us!" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:45 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51 msgid "A service of %s." msgstr "" @@ -10810,23 +10891,23 @@ msgstr "" msgid "Below follows the customer informations:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45 msgid "And here are the items bought by this customer:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:40 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49 msgid "If there are any problems with this email contact the admin of %s." msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:14 msgid "Delivery Address" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:23 msgid "Send buy request" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/send_request.html.erb:1 +#: plugins/shopping_cart/views/shopping_cart_plugin/send_request.html.erb:1 msgid "Request sent successfully check your email." msgstr "" diff --git a/po/pt/noosfero.po b/po/pt/noosfero.po index 8aa34db..2868fbd 100644 --- a/po/pt/noosfero.po +++ b/po/pt/noosfero.po @@ -9,13 +9,12 @@ # Joenio Costa , 2008. # # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.39.1\n" -"POT-Creation-Date: 2013-01-03 20:39-0000\n" -"PO-Revision-Date: 2012-11-30 12:10-0300\n" -"Last-Translator: Joenio Costa \n" +"Project-Id-Version: noosfero 0.39.3\n" +"POT-Creation-Date: 2013-01-19 21:42-0000\n" +"PO-Revision-Date: 2013-03-13 17:47-0300\n" +"Last-Translator: Rodrigo Souto \n" "Language-Team: LANGUAGE TEAM \n" "Language: \n" "MIME-Version: 1.0\n" @@ -32,31 +31,31 @@ msgstr "Seus convites estão sendo enviados." msgid "Please enter a valid email address." msgstr "Por favor entre um endereço de e-mail válido." -#: app/controllers/public/content_viewer_controller.rb:38 -msgid "" -"You are not allowed to view this content. You can contact the owner of this " -"profile to request access then." -msgstr "" -"Você não tem permissão de visualizar este conteúdo. Você pode contactar o " -"dono deste perfil e pedir acesso." +#: app/controllers/public/content_viewer_controller.rb:35 +msgid "You are not allowed to view this content." +msgstr "Você não está autorizado a visualizar esta página." + +#: app/controllers/public/content_viewer_controller.rb:36 +msgid "You can contact the owner of this profile to request access then." +msgstr "Você pode contactar o dono deste perfil e pedir acesso." -#: app/controllers/public/content_viewer_controller.rb:114 +#: app/controllers/public/content_viewer_controller.rb:116 msgid "Notification of new comments to '%s' was successfully canceled" msgstr "A notificação de novos comentários para '%s' foi cancelada com sucesso" -#: app/controllers/public/content_viewer_controller.rb:135 +#: app/controllers/public/content_viewer_controller.rb:137 msgid "Comment succesfully updated" msgstr "Comentário atualizado com sucesso" -#: app/controllers/public/content_viewer_controller.rb:138 +#: app/controllers/public/content_viewer_controller.rb:140 msgid "Comment could not be updated" msgstr "O comentário não pode ser atualizado" -#: app/controllers/public/content_viewer_controller.rb:143 +#: app/controllers/public/content_viewer_controller.rb:145 msgid "Could not find the comment in the article" msgstr "Não foi possível encontrar o comentário no artigo" -#: app/controllers/public/content_viewer_controller.rb:157 +#: app/controllers/public/content_viewer_controller.rb:159 #: app/controllers/my_profile/cms_controller.rb:264 msgid "Please type the words correctly" msgstr "Por favor digite as palavras corretamente" @@ -68,7 +67,6 @@ msgstr "Empreendimentos da rede" #: app/controllers/public/search_controller.rb:151 #: app/models/people_block.rb:4 app/helpers/application_helper.rb:1097 #: app/helpers/assets_helper.rb:8 app/helpers/search_helper.rb:13 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:34 msgid "People" msgstr "Pessoas" @@ -76,7 +74,6 @@ msgstr "Pessoas" #: app/models/enterprises_block.rb:12 app/helpers/assets_helper.rb:10 #: app/helpers/search_helper.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/profile/_person_profile.rhtml:23 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:35 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:13 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:18 msgid "Enterprises" @@ -86,13 +83,11 @@ msgstr "Empreendimentos" #: app/models/products_block.rb:8 app/models/products_block.rb:12 #: app/models/enterprise.rb:130 app/helpers/application_helper.rb:539 #: app/helpers/assets_helper.rb:9 app/views/search/_sellers_form.rhtml:8 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:36 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:22 msgid "Products" msgstr "Produtos" #: app/controllers/public/search_controller.rb:154 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:37 msgid "Upcoming events" msgstr "Próximos eventos" @@ -100,13 +95,11 @@ msgstr "Próximos eventos" #: app/models/communities_block.rb:4 app/helpers/application_helper.rb:524 #: app/helpers/application_helper.rb:1113 app/helpers/assets_helper.rb:11 #: app/helpers/search_helper.rb:14 app/views/profile/_person_profile.rhtml:41 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:38 msgid "Communities" msgstr "Comunidades" #: app/controllers/public/search_controller.rb:156 #: app/helpers/application_helper.rb:1081 app/helpers/search_helper.rb:11 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:39 msgid "Contents" msgstr "Conteúdos" @@ -249,16 +242,7 @@ msgstr "Os e-mail estão sendo enviados" msgid "Could not create the e-mail" msgstr "Não foi possível criar o e-mail" -#: app/controllers/public/profile_controller.rb:373 -msgid "The content here is available to %s's friends only." -msgstr "O conteúdo aqui está disponível apenas para os amigos do(a) %s." - #: app/controllers/public/profile_controller.rb:376 -msgid "The contents in this community is available to members only." -msgstr "" -"O conteúdo desta comunidade está disponível apenas para os seus membros." - -#: app/controllers/public/profile_controller.rb:383 msgid "" "This profile is inaccessible. You don't have the permission to view the " "content here." @@ -266,7 +250,7 @@ msgstr "" "Este perfil esta inacessível. Você não tem permissão de visualizar este " "conteúdo." -#: app/controllers/public/profile_controller.rb:383 +#: app/controllers/public/profile_controller.rb:376 msgid "Oops ... you cannot go ahead here" msgstr "Oops ... você não pode seguir em frente" @@ -516,7 +500,7 @@ msgstr "O insumo não foi encontrado" #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:23 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:6 msgid "Name" msgstr "Nome" @@ -754,7 +738,7 @@ msgstr "noosfero::plugin::activerecord" msgid "profile" msgstr "perfil" -#: app/models/product.rb:- app/models/article.rb:702 app/models/mailing.rb:- +#: app/models/product.rb:- app/models/article.rb:706 app/models/mailing.rb:- #: app/views/cms/view.rhtml:25 #: app/views/shared/reported_versions/_article.html.erb:3 #: app/views/shared/reported_versions/_comment.html.erb:3 @@ -794,15 +778,15 @@ msgstr "Ativar" #: app/views/box_organizer/_link_list_block.rhtml:4 #: plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb:12 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:19 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:25 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:23 msgid "Address" msgstr "Endereço" #: app/models/product.rb:- app/models/create_enterprise.rb:6 #: app/views/profile_editor/_person_form.rhtml:13 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:8 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:8 msgid "Contact phone" msgstr "Telefone de contato" @@ -852,7 +836,7 @@ msgstr "Rodapé personalizado" msgid "Theme" msgstr "Tema" -#: app/models/product.rb:- app/models/profile.rb:715 +#: app/models/product.rb:- app/models/profile.rb:723 msgid "Public profile" msgstr "Perfil público" @@ -958,7 +942,7 @@ msgid "Abstract" msgstr "Resumo" #: app/models/product.rb:- app/models/action_tracker_notification.rb:- -#: app/models/article.rb:706 app/models/person.rb:263 app/models/profile.rb:9 +#: app/models/article.rb:710 app/models/person.rb:266 app/models/profile.rb:9 #: app/models/profile_categorization.rb:- app/views/profile/index.rhtml:28 #: app/views/profile/index.rhtml:33 msgid "Profile" @@ -1137,7 +1121,7 @@ msgstr "evento" msgid "environment" msgstr "comunidade virtual" -#: app/models/product.rb:- app/models/organization.rb:99 +#: app/models/product.rb:- app/models/organization.rb:101 #: app/views/admin_panel/_site_info.rhtml:2 msgid "Contact email" msgstr "Email de contato" @@ -1201,12 +1185,13 @@ msgstr "Categoria do Produto" #: app/models/product.rb:- app/models/price_detail.rb:- #: app/views/manage_products/index.rhtml:6 -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:37 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:55 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 msgid "Price" msgstr "Preço" #: app/models/product.rb:- app/models/certifier.rb:- -#: app/models/organization.rb:99 app/views/search/_product.rhtml:52 +#: app/models/organization.rb:101 app/views/search/_product.rhtml:52 #: app/views/search/_article_description.rhtml:4 #: app/views/profile_editor/_person_form.rhtml:10 #: app/views/cms/_uploaded_file.rhtml:5 @@ -1276,7 +1261,7 @@ msgstr "Autor" #: app/views/cms/suggest_an_article.rhtml:17 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:18 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:16 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:7 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:7 msgid "Email" msgstr "E-mail" @@ -1374,7 +1359,7 @@ msgid "Accept products" msgstr "Aceitar produtos" #: app/models/product.rb:- app/models/create_enterprise.rb:8 -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 #: app/views/enterprise_validation/_details.rhtml:19 msgid "Acronym" msgstr "Sigla" @@ -1400,51 +1385,51 @@ msgstr "Posição" msgid "Fetched at" msgstr "Obtido em" -#: app/models/product.rb:76 app/helpers/display_helper.rb:34 -#: app/helpers/display_helper.rb:43 +#: app/models/product.rb:80 app/helpers/display_helper.rb:42 +#: app/helpers/display_helper.rb:51 msgid "Uncategorized product" msgstr "Produto não categorizado" -#: app/models/product.rb:206 +#: app/models/product.rb:210 msgid "0%" msgstr "0%" -#: app/models/product.rb:207 +#: app/models/product.rb:211 msgid "25%" msgstr "25%" -#: app/models/product.rb:208 +#: app/models/product.rb:212 msgid "50%" msgstr "50%" -#: app/models/product.rb:209 +#: app/models/product.rb:213 msgid "75%" msgstr "75%" -#: app/models/product.rb:210 +#: app/models/product.rb:214 msgid "100%" msgstr "100%" -#: app/models/product.rb:234 +#: app/models/product.rb:238 msgid " cert. " msgstr " cert. " -#: app/models/product.rb:259 +#: app/models/product.rb:263 msgid "Related products" msgstr "Produtos relacionados" -#: app/models/product.rb:260 app/models/contact.rb:- app/models/person.rb:204 -#: app/models/profile.rb:942 app/models/enterprise.rb:23 +#: app/models/product.rb:264 app/models/contact.rb:- app/models/person.rb:207 +#: app/models/profile.rb:950 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:11 app/views/search/_product.rhtml:59 #: app/views/search/_profile.rhtml:21 #: app/views/profile_editor/_person_form.rhtml:21 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:10 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:12 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:18 msgid "City" msgstr "Cidade" -#: app/models/product.rb:261 app/views/search/_product.rhtml:65 +#: app/models/product.rb:265 app/views/search/_product.rhtml:65 msgid "Qualifiers" msgstr "Qualificadores" @@ -1510,7 +1495,7 @@ msgstr "Novo" #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:16 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:52 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:42 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:25 msgid "Save" msgstr "Salvar" @@ -1606,7 +1591,6 @@ msgstr "Acima Vermelho" #: app/views/search/_search_form.rhtml:24 #: app/views/cms/_text_editor_sidebar.rhtml:36 app/views/home/index.rhtml:61 #: app/views/profile_members/_add_admins.rhtml:5 -#: plugins/solr/views/search/_search_form.rhtml:24 msgid "Search" msgstr "Busca" @@ -1821,7 +1805,7 @@ msgstr "Assunto" msgid "Message" msgstr "Mensagem" -#: app/models/contact.rb:- app/models/person.rb:204 +#: app/models/contact.rb:- app/models/person.rb:207 #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:10 #: app/views/profile_editor/_person_form.rhtml:20 #: plugins/bsc/lib/bsc_plugin/contract.rb:46 @@ -1854,11 +1838,11 @@ msgstr "(usuário removido)" msgid "(unauthenticated user)" msgstr "(usuário não autenticado)" -#: app/models/comment.rb:179 +#: app/models/comment.rb:183 msgid "[%s] you got a new comment!" msgstr "[%s] você recebeu um novo comentário!" -#: app/models/comment.rb:194 +#: app/models/comment.rb:198 msgid "[%s] %s commented on a content of %s" msgstr "[%s] %s comentou no conteúdo de %s" @@ -1958,7 +1942,7 @@ msgstr "auto-referência não é permitido." msgid "cyclical reference is not allowed." msgstr "referência cíclica não é permitido." -#: app/models/article.rb:170 app/models/organization.rb:99 +#: app/models/article.rb:170 app/models/organization.rb:101 msgid "Tag list" msgstr "Lista de marcadores" @@ -1986,59 +1970,59 @@ msgstr "Um idioma deve ser escolhido para o artigo nativo" msgid "Unknown" msgstr "Desconhecido" -#: app/models/article.rb:605 +#: app/models/article.rb:609 msgid "no comments" msgstr "nenhum comentário" -#: app/models/article.rb:606 +#: app/models/article.rb:610 msgid "one comment" msgstr "um comentário" -#: app/models/article.rb:607 +#: app/models/article.rb:611 msgid "%s comments" msgstr "%s comentários" -#: app/models/article.rb:614 +#: app/models/article.rb:618 msgid "no views" msgstr "nenhuma visualização" -#: app/models/article.rb:615 +#: app/models/article.rb:619 msgid "one view" msgstr "uma visualização" -#: app/models/article.rb:616 +#: app/models/article.rb:620 msgid "%s views" msgstr "%s visualizações" -#: app/models/article.rb:621 +#: app/models/article.rb:625 msgid "Created at: " msgstr "Criado em: " -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Published date" msgstr "Data de publicação" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Older than one year" msgstr "Mais de um ano" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last year" msgstr "No último ano" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last month" msgstr "No último mês" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last week" msgstr "Na última semana" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last day" msgstr "No último dia" -#: app/models/article.rb:707 app/helpers/application_helper.rb:614 +#: app/models/article.rb:711 app/helpers/application_helper.rb:614 #: app/views/search/_article_categories.rhtml:2 #: app/views/categories/index.rhtml:1 app/views/admin_panel/index.rhtml:41 #: app/views/content_viewer/view_page.rhtml:77 @@ -2324,15 +2308,19 @@ msgstr "Redireciona o usuário para a sua página inicial." msgid "Redirects the user to his control panel." msgstr "Redireciona o usuário para seu painel de controle." -#: app/models/environment.rb:579 +#: app/models/environment.rb:238 +msgid "This enterprise needs to be enabled." +msgstr "Esse empreendimento precisa ser habilitado." + +#: app/models/environment.rb:580 msgid "Only one Virtual Community can be the default one" msgstr "Apenas uma comunidade virtual pode ser a padrão" -#: app/models/environment.rb:842 +#: app/models/environment.rb:843 msgid "is not available." msgstr "não está disponível" -#: app/models/environment.rb:850 +#: app/models/environment.rb:851 msgid "have unsupported languages." msgstr "tem idiomas não suportados." @@ -2567,9 +2555,9 @@ msgstr "feed externo" msgid "Feed title" msgstr "Título do feed" -#: app/models/external_feed.rb:- app/models/person.rb:266 -#: app/models/person.rb:277 app/models/organization.rb:121 -#: app/models/organization.rb:132 app/models/blog.rb:13 app/models/blog.rb:17 +#: app/models/external_feed.rb:- app/models/person.rb:269 +#: app/models/person.rb:280 app/models/organization.rb:123 +#: app/models/organization.rb:134 app/models/blog.rb:13 app/models/blog.rb:17 #: app/models/enterprise.rb:129 app/models/enterprise.rb:145 msgid "Blog" msgstr "Blog" @@ -2684,8 +2672,8 @@ msgstr "Método de Validação" msgid "Restrictions" msgstr "Limitações" -#: app/models/validation_info.rb:- app/models/person.rb:195 -#: app/views/profile_editor/_person_form.rhtml:60 +#: app/models/validation_info.rb:- app/models/person.rb:198 +#: app/views/profile_editor/_person_form.rhtml:62 msgid "Organization" msgstr "Organização" @@ -2721,108 +2709,123 @@ msgstr "escola" msgid "family" msgstr "família" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:14 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:14 msgid "Cell phone" msgstr "Telefone celular" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:15 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:15 msgid "Comercial phone" msgstr "Telefone comercial" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:18 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:18 msgid "Nationality" msgstr "Nacionalidade" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:27 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:29 msgid "Schooling" msgstr "Escolaridade" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:52 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:54 msgid "Area of study" msgstr "Área de estudo" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:59 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:61 msgid "Professional activity" msgstr "Atividade profissional" -#: app/models/person.rb:195 app/models/enterprise.rb:23 -#: app/views/profile_editor/_person_form.rhtml:61 +#: app/models/person.rb:198 app/models/enterprise.rb:23 +#: app/views/profile_editor/_person_form.rhtml:63 msgid "Organization website" msgstr "Website da organização" -#: app/models/person.rb:198 +#: app/models/person.rb:201 msgid "Schooling status" msgstr "Situação da escolaridade" -#: app/models/person.rb:201 app/helpers/profile_editor_helper.rb:26 -#: app/views/profile_editor/_person_form.rhtml:45 +#: app/models/person.rb:204 app/helpers/profile_editor_helper.rb:26 +#: app/views/profile_editor/_person_form.rhtml:47 msgid "Education" msgstr "Educação" -#: app/models/person.rb:201 +#: app/models/person.rb:204 msgid "Custom education" msgstr "Outra formação" -#: app/models/person.rb:201 app/views/profile_editor/_person_form.rhtml:55 +#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:57 msgid "Custom area of study" msgstr "Outra área de estudo" -#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:12 +#: app/models/person.rb:207 app/views/profile_editor/_person_form.rhtml:12 msgid "Contact information" msgstr "Informação de contato" -#: app/models/person.rb:204 app/models/enterprise.rb:23 +#: app/models/person.rb:207 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:9 -#: app/views/shared/_organization_custom_fields.rhtml:16 +#: app/views/shared/_organization_custom_fields.rhtml:18 #: app/views/profile_editor/_person_form.rhtml:19 #: plugins/bsc/views/shared/_fields.html.erb:65 msgid "Country" msgstr "País" -#: app/models/person.rb:204 +#: app/models/person.rb:207 msgid "Sex" msgstr "Sexo" -#: app/models/person.rb:204 +#: app/models/person.rb:207 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 msgid "Zip code" msgstr "CEP" -#: app/models/person.rb:235 +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:14 +#: app/views/profile_editor/_person_form.rhtml:25 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17 +msgid "District" +msgstr "Bairro" + +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/profile_editor/_person_form.rhtml:24 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16 +msgid "Address reference" +msgstr "Ponto de referência" + +#: app/models/person.rb:238 msgid "%{fn} is already used by other user" msgstr "%{fn} já está sendo usado por outro usuário." -#: app/models/person.rb:264 app/models/organization.rb:120 +#: app/models/person.rb:267 app/models/organization.rb:122 msgid "Image gallery" msgstr "Galeria de Imagens" -#: app/models/person.rb:265 app/models/organization.rb:119 +#: app/models/person.rb:268 app/models/organization.rb:121 #: app/helpers/application_helper.rb:532 app/helpers/application_helper.rb:541 msgid "Agenda" msgstr "Agenda" -#: app/models/person.rb:278 app/models/gallery.rb:4 app/models/gallery.rb:8 -#: app/models/organization.rb:133 app/views/search/_uploaded_file.rhtml:14 +#: app/models/person.rb:281 app/models/gallery.rb:4 app/models/gallery.rb:8 +#: app/models/organization.rb:135 app/views/search/_uploaded_file.rhtml:14 msgid "Gallery" msgstr "Galeria" -#: app/models/person.rb:390 +#: app/models/person.rb:393 msgid "none" msgstr "nenhum(a)" -#: app/models/person.rb:391 +#: app/models/person.rb:394 msgid "one friend" msgstr "um amigo" -#: app/models/person.rb:392 +#: app/models/person.rb:395 msgid "%s friends" msgstr "%s amigos" -#: app/models/person.rb:427 +#: app/models/person.rb:430 msgid "You just left %s." msgstr "Você acabou de sair de %s." -#: app/models/person.rb:451 app/models/profile.rb:868 +#: app/models/person.rb:454 app/models/profile.rb:876 msgid "Edit Profile" msgstr "Editar perfil" @@ -2910,63 +2913,63 @@ msgstr "Convidar membros" msgid "Send e-Mail to members" msgstr "Enviar e-mail para os membros" -#: app/models/profile.rb:301 +#: app/models/profile.rb:305 msgid "is not a template." msgstr "não é um modelo." -#: app/models/profile.rb:613 +#: app/models/profile.rb:621 msgid "%s can't have members" msgstr "%s não pode ter integrantes" -#: app/models/profile.rb:634 +#: app/models/profile.rb:642 msgid "%s can't has moderators" msgstr "%s não pode ter moderadores" -#: app/models/profile.rb:715 +#: app/models/profile.rb:723 msgid "Private profile" msgstr "Perfil privado" -#: app/models/profile.rb:812 +#: app/models/profile.rb:820 msgid "Since: " msgstr "Desde: " -#: app/models/profile.rb:827 +#: app/models/profile.rb:835 msgid "no activity" msgstr "nenhuma atividade" -#: app/models/profile.rb:828 +#: app/models/profile.rb:836 msgid "one activity" msgstr "uma atividade" -#: app/models/profile.rb:829 +#: app/models/profile.rb:837 msgid "%s activities" msgstr "%s atividades" -#: app/models/profile.rb:835 +#: app/models/profile.rb:843 msgid "no members" msgstr "nenhum integrante" -#: app/models/profile.rb:836 +#: app/models/profile.rb:844 msgid "one member" msgstr "um integrante" -#: app/models/profile.rb:837 +#: app/models/profile.rb:845 msgid "%s members" msgstr "%s integrantes" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 msgid "facets|Enabled" msgstr "Habilitado" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 msgid "facets|Not enabled" msgstr "Não habilitado" -#: app/models/profile.rb:940 +#: app/models/profile.rb:948 msgid "Situation" msgstr "Situação" -#: app/models/profile.rb:970 +#: app/models/profile.rb:978 msgid "Profile Info and settings" msgstr "Informações e Configurações do Perfil" @@ -3006,7 +3009,7 @@ msgstr "Qualificador" msgid "Certifier" msgstr "Certificador" -#: app/models/unit.rb:- app/views/catalog/index.rhtml:37 +#: app/models/unit.rb:- app/views/catalog/index.rhtml:59 msgid "unit" msgstr "unidade" @@ -3418,23 +3421,23 @@ msgstr "categories perfil" msgid "profilecategorization" msgstr "categorizaçãoperfil" -#: app/models/create_enterprise.rb:7 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:101 msgid "Contact person" msgstr "Pessoa de contato" -#: app/models/create_enterprise.rb:9 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:101 msgid "Foundation year" msgstr "Ano de fundação" -#: app/models/create_enterprise.rb:10 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:101 msgid "Legal form" msgstr "Estatuto Jurídico" -#: app/models/create_enterprise.rb:11 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:101 msgid "Economic activity" msgstr "Atividade econômica" -#: app/models/create_enterprise.rb:12 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:101 msgid "Management information" msgstr "Gerenciamento de informação" @@ -3569,15 +3572,15 @@ msgid " is inviting you to join \"\" on ." msgstr "" " está te convidando a entrar em \"\" no ." -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 msgid "Display name" msgstr "Nome de exibição" -#: app/models/organization.rb:117 +#: app/models/organization.rb:119 msgid "Community's profile" msgstr "Perfil da comunidade" -#: app/models/organization.rb:118 +#: app/models/organization.rb:120 msgid "Invite Friends" msgstr "Convidar Amigos" @@ -3678,9 +3681,9 @@ msgid "Activities short description" msgstr "Breve descrição das atividades" #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:12 -#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/shared/_organization_custom_fields.rhtml:15 #: app/views/profile_editor/_person_form.rhtml:22 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:13 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:19 msgid "ZIP code" msgstr "CEP" @@ -4289,11 +4292,11 @@ msgstr "Ocupado" msgid "Sign out of chat" msgstr "Sair do bate-papo" -#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:12 +#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:20 msgid "No product" msgstr "Sem produto" -#: app/helpers/display_helper.rb:59 +#: app/helpers/display_helper.rb:67 msgid "Are you sure you want to visit this web site?" msgstr "Tem certeza que quer visitar este web site?" @@ -4571,7 +4574,7 @@ msgstr "%{distance} dias atrás" msgid "Source: %s" msgstr "Fonte: %s" -#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:17 +#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:39 #: app/views/search/_image.rhtml:43 app/views/cms/_text_editor_sidebar.rhtml:3 #: app/views/manage_products/_display_image.rhtml:6 msgid "Zoom in" @@ -4626,6 +4629,15 @@ msgstr "" msgid "Type in a search term" msgstr "Digite um termo de pesquisa" +#: app/helpers/application_helper.rb:1418 +msgid "The content here is available to %s's friends only." +msgstr "O conteúdo aqui está disponível apenas para os amigos do(a) %s." + +#: app/helpers/application_helper.rb:1421 +msgid "The contents in this community is available to members only." +msgstr "" +"O conteúdo desta comunidade está disponível apenas para os seus membros." + #: app/helpers/events_helper.rb:4 msgid "Select a day on the left to display it's events here" msgstr "Selecione um dia na esquerda para mostrar seus eventos aqui" @@ -4781,6 +4793,10 @@ msgstr "Divulgar" msgid "Delete" msgstr "Remover" +#: app/helpers/catalog_helper.rb:7 +msgid "Start" +msgstr "Início" + #: app/helpers/blog_helper.rb:10 msgid "New post" msgstr "Novo post" @@ -5465,49 +5481,57 @@ msgstr "O e-mail será enviado para os administradores de '%s'" msgid "I want to receive a copy of the message in my e-mail." msgstr "Quero receber uma cópia da mensagem no meu e-mail." -#: app/views/catalog/index.rhtml:5 app/views/blocks/profile_info.rhtml:21 +#: app/views/catalog/index.rhtml:4 app/views/blocks/profile_info.rhtml:21 #: app/views/profile/_organization_profile.rhtml:26 msgid "Products/Services" msgstr "Produtos/Serviços" -#: app/views/catalog/index.rhtml:20 app/views/search/_image.rhtml:35 +#: app/views/catalog/index.rhtml:16 +msgid "There are no sub-categories for %s" +msgstr "Não há subcategorias para %s" + +#: app/views/catalog/index.rhtml:34 +msgid "Highlighted product" +msgstr "Produto destacado" + +#: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35 #: app/views/search/_image.rhtml:47 msgid "No image" -msgstr "Nenhum imagem" +msgstr "Nenhuma imagem" -#: app/views/catalog/index.rhtml:30 +#: app/views/catalog/index.rhtml:52 msgid "from " msgstr "de " -#: app/views/catalog/index.rhtml:31 +#: app/views/catalog/index.rhtml:53 msgid "by " msgstr "por " -#: app/views/catalog/index.rhtml:37 +#: app/views/catalog/index.rhtml:59 msgid " / " msgstr " / " -#: app/views/catalog/index.rhtml:45 +#: app/views/catalog/index.rhtml:67 msgid "description" msgstr "descrição" -#: app/views/catalog/index.rhtml:55 +#: app/views/catalog/index.rhtml:77 msgid "price composition" msgstr "composição de preço" -#: app/views/catalog/index.rhtml:78 +#: app/views/catalog/index.rhtml:100 msgid "inputs and raw materials" msgstr "Insumos e matéria-prima" -#: app/views/catalog/index.rhtml:84 +#: app/views/catalog/index.rhtml:106 msgid "%{amount_used} %{unit} of" msgstr "%{amount_used} %{unit} de" -#: app/views/catalog/index.rhtml:95 +#: app/views/catalog/index.rhtml:117 msgid "qualifiers" msgstr "qualificadores" -#: app/views/catalog/index.rhtml:103 +#: app/views/catalog/index.rhtml:125 msgid "product unavailable" msgstr "produto indisponível" @@ -5595,7 +5619,7 @@ msgstr "Gerenciar SPAM" #: app/views/profile_editor/edit.rhtml:64 app/views/cms/view.rhtml:9 #: app/views/tasks/index.rhtml:37 app/views/tasks/index.rhtml:62 #: app/views/box_organizer/index.rhtml:5 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:43 msgid "Back to control panel" msgstr "Voltar ao painel de controle" @@ -5764,7 +5788,7 @@ msgstr "Localização" #: app/views/maps/edit_location.rhtml:13 #: app/views/shared/_organization_custom_fields.rhtml:12 #: app/views/profile_editor/_person_form.rhtml:23 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15 msgid "Address (street and number)" msgstr "Endereço (rua e número)" @@ -6209,22 +6233,18 @@ msgid "Supplier" msgstr "Fornecedor" #: app/views/search/index.rhtml:7 app/views/search/category_index.rhtml:7 -#: plugins/solr/views/solr_plugin_public/index.rhtml:7 msgid "Search Results" msgstr "Resultados da Busca" #: app/views/search/index.rhtml:14 app/views/search/category_index.rhtml:14 -#: plugins/solr/views/solr_plugin_public/index.rhtml:14 msgid "Sub-categories" msgstr "Subcategorias" #: app/views/search/index.rhtml:16 app/views/search/category_index.rhtml:16 -#: plugins/solr/views/solr_plugin_public/index.rhtml:16 msgid "No sub-categories" msgstr "Sem subcategorias" #: app/views/search/_facets_unselect_menu.rhtml:3 -#: plugins/solr/views/search/_facets_unselect_menu.rhtml:3 msgid "Applied filters" msgstr "Aplicar filtros" @@ -7166,7 +7186,7 @@ msgstr "" msgid "Home phone" msgstr "Telefone residencial" -#: app/views/profile_editor/_person_form.rhtml:48 +#: app/views/profile_editor/_person_form.rhtml:50 msgid "Custom formation" msgstr "Outra formação" @@ -9185,7 +9205,7 @@ msgstr "" #: app/views/layouts/application-ng.rhtml:68 msgid "or " -msgstr "or " +msgstr "ou " #: app/views/layouts/application-ng.rhtml:68 msgid "Sign up" @@ -9963,7 +9983,7 @@ msgid "[%s] Bsc management transferred to you." msgstr "[%s] Administração de Bsc transferida para você." #: plugins/bsc/lib/bsc_plugin/contract.rb:33 -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Opened" msgstr "Aberto" @@ -10204,92 +10224,101 @@ msgstr "" msgid "The tolerance time for editing this content is over." msgstr "O tempo de tolerância para edição deste conteúdo acabou." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:10 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:13 msgid "Option updated successfully." msgstr "Opção foi atualizada com sucesso." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:12 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:15 msgid "Option wasn't updated successfully." msgstr "Opção não foi atualizada com sucesso." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:98 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:116 msgid "Request sent successfully. Check your email." msgstr "Requisição enviada com sucesso. Cheque seu email." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:121 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:139 msgid "Basket displayed." msgstr "Cesto exibido." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:140 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:158 msgid "Basket hidden." msgstr "Cesto escondido." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:162 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:186 +msgid "Delivery option updated." +msgstr "Opção de entrega atualizada." + +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:199 msgid "Can't join items from different enterprises." msgstr "Não é possível juntar itens de empreendimentos diferentes." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:176 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:213 msgid "There is no basket." msgstr "Não há cesto." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:192 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:229 msgid "This enterprise doesn't have this product." msgstr "Este empreendimento não tem esse produto." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:206 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:243 msgid "The basket doesn't have this product." msgstr "O cesto não tem esse produto." -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:220 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:257 msgid "Invalid quantity." msgstr "Quantidade inválida." -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:11 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:12 msgid "A shopping basket feature for enterprises" msgstr "Funcionalidade de cesto de compras para empreendimentos" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:17 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:37 msgid "Add to basket" msgstr "Adicionar ao cesto" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:44 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:65 msgid "Shopping basket" msgstr "Cesto de compras" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:47 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:68 msgid "Purchase reports" msgstr "Relatórios de compras" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:8 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:10 msgid "[%s] Your buy request was performed successfully." msgstr "[%s] Seu pedido de compra foi realizado com sucesso." -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:21 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:25 msgid "[%s] You have a new buy request from %s." msgstr "[%s] Você tem um novo pedido de compra de %s." -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:22 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41 +msgid "Free delivery" +msgstr "Frete grátis" + +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7 msgid "Delivery" msgstr "Entrega" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:35 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53 msgid "Item name" msgstr "Nome do item" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:52 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76 #: plugins/shopping_cart/views/cart.html.erb:9 msgid "Total:" msgstr "Total:" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Canceled" msgstr "Cancelado" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Confirmed" msgstr "Confirmado" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 msgid "Shipped" msgstr "Enviado" @@ -11057,6 +11086,10 @@ msgstr "Tempo de tolerância para edição de comentários" msgid "Empty means unlimited and zero means right away." msgstr "Vazio significa ilimitado e zero significa imediatamente." +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 +msgid "shopping_cart|Change" +msgstr "Troco" + #: plugins/shopping_cart/views/cart.html.erb:2 msgid "Are you sure you want to remove this item?" msgstr "Tem certeza de que quer excluir este ítem?" @@ -11118,6 +11151,26 @@ msgstr "Valor de compra" msgid "E-mail" msgstr "E-mail" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9 +#, fuzzy +msgid "Delivery option" +msgstr "Preço de entrega:" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Payment" +msgstr "Pagamento" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 +#, fuzzy +msgid "Change" +msgstr "Mudar imagem" + #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:1 msgid "Basket options" msgstr "Opções do cesto" @@ -11126,10 +11179,30 @@ msgstr "Opções do cesto" msgid "Delivery?" msgstr "Entrega?" -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:6 -msgid "Delivery price:" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +msgid "Option" +msgstr "Opção" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:24 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:32 +#, fuzzy +msgid "Remove option" +msgstr "Mais opções" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:27 +msgid "ADD NEW OPTION" +msgstr "ADCIONAR NOVA OPÇÂO" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 +#, fuzzy +msgid "Free delivery price:" msgstr "Preço de entrega:" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 +msgid "Empty stands for no free delivery price." +msgstr "Vazio significa sem preço de frete grátis." + #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10 msgid "This is a notification e-mail about your buy request on %s." msgstr "Esse é um email de notificação sobre o seu pedido de compra em %s." @@ -11155,16 +11228,29 @@ msgstr "Por favor cheque se suas informações abaixo estão corretas:" msgid "Phone number" msgstr "Telefone" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:37 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Money" +msgstr "Dinheiro" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +#, fuzzy +msgid "Check" +msgstr "Marcar todos" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47 msgid "Here are the products you bought:" msgstr "Aqui estão os produtos que você pediu:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51 msgid "Thanks for buying with us!" msgstr "Obrigado por comprar conosco!" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:45 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51 msgid "A service of %s." msgstr "Um serviço de %s." @@ -11176,24 +11262,24 @@ msgstr "Esse é um pedido de compra feito por %s." msgid "Below follows the customer informations:" msgstr "Abaixo seguem as informações do consumidor:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45 msgid "And here are the items bought by this customer:" msgstr "E aqui estão os itens pedidos por esse consumidor:" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:40 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49 msgid "If there are any problems with this email contact the admin of %s." msgstr "" "Se houver algum problema com esse email contacte o administrador de %s." -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:14 msgid "Delivery Address" msgstr "Endereço de Entrega" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:23 msgid "Send buy request" msgstr "Enviar pedido de compra" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/send_request.html.erb:1 +#: plugins/shopping_cart/views/shopping_cart_plugin/send_request.html.erb:1 msgid "Request sent successfully check your email." msgstr "Requisição enviada com sucesso. Cheque seu email." @@ -11336,9 +11422,6 @@ msgstr "" #~ msgid "Remove this comment and all its replies" #~ msgstr "Remover este comentário e todas as suas respostas" -#~ msgid "Option" -#~ msgstr "Opção" - #~ msgid "What's new" #~ msgstr "Novidades" @@ -11468,9 +11551,6 @@ msgstr "" #~ msgid "product categorization" #~ msgstr "categorização do produto" -#~ msgid "There is no categories." -#~ msgstr "Não há categorias." - #~ msgid "Listing sellers of %s witin %s km from %s %s" #~ msgstr "Listando vendedores de %s dentro de %s km de %s %s" diff --git a/po/ru/noosfero.po b/po/ru/noosfero.po index 693385a..9da9464 100644 --- a/po/ru/noosfero.po +++ b/po/ru/noosfero.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.39.1\n" -"POT-Creation-Date: 2013-01-03 20:39-0000\n" +"Project-Id-Version: noosfero 0.39.3\n" +"POT-Creation-Date: 2013-01-19 21:42-0000\n" "PO-Revision-Date: 2010-10-26 09:57-0300\n" "Last-Translator: Anton \n" "Language-Team: German \n" @@ -24,33 +24,37 @@ msgstr "Ваше приглашение отправлено" msgid "Please enter a valid email address." msgstr "Пожалуйста, введите правильный E-Mail." -#: app/controllers/public/content_viewer_controller.rb:38 -msgid "" -"You are not allowed to view this content. You can contact the owner of this " -"profile to request access then." +#: app/controllers/public/content_viewer_controller.rb:35 +#, fuzzy +msgid "You are not allowed to view this content." +msgstr "Вам не позволено просматривать эту страницу" + +#: app/controllers/public/content_viewer_controller.rb:36 +#, fuzzy +msgid "You can contact the owner of this profile to request access then." msgstr "Вы не можете просматривать данный контент. Обратитесь к автору." -#: app/controllers/public/content_viewer_controller.rb:114 +#: app/controllers/public/content_viewer_controller.rb:116 #, fuzzy msgid "Notification of new comments to '%s' was successfully canceled" msgstr "Активность успешно удалена." -#: app/controllers/public/content_viewer_controller.rb:135 +#: app/controllers/public/content_viewer_controller.rb:137 #, fuzzy msgid "Comment succesfully updated" msgstr "Комментарий успешно удален" -#: app/controllers/public/content_viewer_controller.rb:138 +#: app/controllers/public/content_viewer_controller.rb:140 #, fuzzy msgid "Comment could not be updated" msgstr "Адрес не может быть сохранен" -#: app/controllers/public/content_viewer_controller.rb:143 +#: app/controllers/public/content_viewer_controller.rb:145 #, fuzzy msgid "Could not find the comment in the article" msgstr "Невозможно создать e-mail" -#: app/controllers/public/content_viewer_controller.rb:157 +#: app/controllers/public/content_viewer_controller.rb:159 #: app/controllers/my_profile/cms_controller.rb:264 msgid "Please type the words correctly" msgstr "" @@ -63,7 +67,6 @@ msgstr "Категории профиля" #: app/controllers/public/search_controller.rb:151 #: app/models/people_block.rb:4 app/helpers/application_helper.rb:1097 #: app/helpers/assets_helper.rb:8 app/helpers/search_helper.rb:13 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:34 msgid "People" msgstr "Пользователи" @@ -71,7 +74,6 @@ msgstr "Пользователи" #: app/models/enterprises_block.rb:12 app/helpers/assets_helper.rb:10 #: app/helpers/search_helper.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/profile/_person_profile.rhtml:23 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:35 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:13 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:18 msgid "Enterprises" @@ -81,13 +83,11 @@ msgstr "Компании" #: app/models/products_block.rb:8 app/models/products_block.rb:12 #: app/models/enterprise.rb:130 app/helpers/application_helper.rb:539 #: app/helpers/assets_helper.rb:9 app/views/search/_sellers_form.rhtml:8 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:36 #: plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb:22 msgid "Products" msgstr "Продукты" #: app/controllers/public/search_controller.rb:154 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:37 msgid "Upcoming events" msgstr "Предстоящие события" @@ -95,13 +95,11 @@ msgstr "Предстоящие события" #: app/models/communities_block.rb:4 app/helpers/application_helper.rb:524 #: app/helpers/application_helper.rb:1113 app/helpers/assets_helper.rb:11 #: app/helpers/search_helper.rb:14 app/views/profile/_person_profile.rhtml:41 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:38 msgid "Communities" msgstr "Сообщества" #: app/controllers/public/search_controller.rb:156 #: app/helpers/application_helper.rb:1081 app/helpers/search_helper.rb:11 -#: plugins/solr/controllers/public/solr_plugin_public_controller.rb:39 #, fuzzy msgid "Contents" msgstr "Контент" @@ -258,21 +256,13 @@ msgstr "Сообщения отправлены" msgid "Could not create the e-mail" msgstr "Невозможно создать e-mail" -#: app/controllers/public/profile_controller.rb:373 -msgid "The content here is available to %s's friends only." -msgstr "%s ограничивает доступ к данной информации только кругом друзей." - #: app/controllers/public/profile_controller.rb:376 -msgid "The contents in this community is available to members only." -msgstr "Ктонтент єтого сообщества доступен только его членам." - -#: app/controllers/public/profile_controller.rb:383 msgid "" "This profile is inaccessible. You don't have the permission to view the " "content here." msgstr "" -#: app/controllers/public/profile_controller.rb:383 +#: app/controllers/public/profile_controller.rb:376 msgid "Oops ... you cannot go ahead here" msgstr "Лажа... Вы не можете сюда зайти" @@ -532,7 +522,7 @@ msgstr "Ввод не найден" #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:23 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:6 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:6 msgid "Name" msgstr "Имя" @@ -781,7 +771,7 @@ msgstr "" msgid "profile" msgstr "Профиль" -#: app/models/product.rb:- app/models/article.rb:702 app/models/mailing.rb:- +#: app/models/product.rb:- app/models/article.rb:706 app/models/mailing.rb:- #: app/views/cms/view.rhtml:25 #: app/views/shared/reported_versions/_article.html.erb:3 #: app/views/shared/reported_versions/_comment.html.erb:3 @@ -821,15 +811,15 @@ msgstr "Активный" #: app/views/box_organizer/_link_list_block.rhtml:4 #: plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb:12 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:19 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:25 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:23 msgid "Address" msgstr "Адрес" #: app/models/product.rb:- app/models/create_enterprise.rb:6 #: app/views/profile_editor/_person_form.rhtml:13 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:8 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:8 msgid "Contact phone" msgstr "Контактный телефон" @@ -879,7 +869,7 @@ msgstr "Пользовательская подпись" msgid "Theme" msgstr "Тема" -#: app/models/product.rb:- app/models/profile.rb:715 +#: app/models/product.rb:- app/models/profile.rb:723 msgid "Public profile" msgstr "Публичный пофиль" @@ -996,7 +986,7 @@ msgid "Abstract" msgstr "Аннотация" #: app/models/product.rb:- app/models/action_tracker_notification.rb:- -#: app/models/article.rb:706 app/models/person.rb:263 app/models/profile.rb:9 +#: app/models/article.rb:710 app/models/person.rb:266 app/models/profile.rb:9 #: app/models/profile_categorization.rb:- app/views/profile/index.rhtml:28 #: app/views/profile/index.rhtml:33 msgid "Profile" @@ -1195,7 +1185,7 @@ msgstr "Событие" msgid "environment" msgstr "обстановка" -#: app/models/product.rb:- app/models/organization.rb:99 +#: app/models/product.rb:- app/models/organization.rb:101 #: app/views/admin_panel/_site_info.rhtml:2 msgid "Contact email" msgstr "Контактный email" @@ -1262,12 +1252,13 @@ msgstr "Категория продукта" #: app/models/product.rb:- app/models/price_detail.rb:- #: app/views/manage_products/index.rhtml:6 -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:37 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:55 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 msgid "Price" msgstr "цена" #: app/models/product.rb:- app/models/certifier.rb:- -#: app/models/organization.rb:99 app/views/search/_product.rhtml:52 +#: app/models/organization.rb:101 app/views/search/_product.rhtml:52 #: app/views/search/_article_description.rhtml:4 #: app/views/profile_editor/_person_form.rhtml:10 #: app/views/cms/_uploaded_file.rhtml:5 @@ -1340,7 +1331,7 @@ msgstr "Автор" #: app/views/cms/suggest_an_article.rhtml:17 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:18 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:16 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:7 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:7 msgid "Email" msgstr "E-Mail" @@ -1450,7 +1441,7 @@ msgid "Accept products" msgstr "Отразить продукты" #: app/models/product.rb:- app/models/create_enterprise.rb:8 -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 #: app/views/enterprise_validation/_details.rhtml:19 msgid "Acronym" msgstr "Акроним" @@ -1477,52 +1468,52 @@ msgstr "Позиция" msgid "Fetched at" msgstr "Доставлено в" -#: app/models/product.rb:76 app/helpers/display_helper.rb:34 -#: app/helpers/display_helper.rb:43 +#: app/models/product.rb:80 app/helpers/display_helper.rb:42 +#: app/helpers/display_helper.rb:51 msgid "Uncategorized product" msgstr "Продукт без категории" -#: app/models/product.rb:206 +#: app/models/product.rb:210 msgid "0%" msgstr "" -#: app/models/product.rb:207 +#: app/models/product.rb:211 msgid "25%" msgstr "" -#: app/models/product.rb:208 +#: app/models/product.rb:212 msgid "50%" msgstr "" -#: app/models/product.rb:209 +#: app/models/product.rb:213 msgid "75%" msgstr "" -#: app/models/product.rb:210 +#: app/models/product.rb:214 msgid "100%" msgstr "" -#: app/models/product.rb:234 +#: app/models/product.rb:238 msgid " cert. " msgstr "" -#: app/models/product.rb:259 +#: app/models/product.rb:263 #, fuzzy msgid "Related products" msgstr "Отразить продукты" -#: app/models/product.rb:260 app/models/contact.rb:- app/models/person.rb:204 -#: app/models/profile.rb:942 app/models/enterprise.rb:23 +#: app/models/product.rb:264 app/models/contact.rb:- app/models/person.rb:207 +#: app/models/profile.rb:950 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:11 app/views/search/_product.rhtml:59 #: app/views/search/_profile.rhtml:21 #: app/views/profile_editor/_person_form.rhtml:21 #: plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb:10 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:12 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:18 msgid "City" msgstr "Город" -#: app/models/product.rb:261 app/views/search/_product.rhtml:65 +#: app/models/product.rb:265 app/views/search/_product.rhtml:65 #, fuzzy msgid "Qualifiers" msgstr "Квалификатор" @@ -1589,7 +1580,7 @@ msgstr "Новый" #: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:16 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:52 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:21 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:42 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:25 msgid "Save" msgstr "Сохранить" @@ -1685,7 +1676,6 @@ msgstr "Красный вверх" #: app/views/search/_search_form.rhtml:24 #: app/views/cms/_text_editor_sidebar.rhtml:36 app/views/home/index.rhtml:61 #: app/views/profile_members/_add_admins.rhtml:5 -#: plugins/solr/views/search/_search_form.rhtml:24 msgid "Search" msgstr "Поиск" @@ -1906,7 +1896,7 @@ msgstr "Тема" msgid "Message" msgstr "Сообщение" -#: app/models/contact.rb:- app/models/person.rb:204 +#: app/models/contact.rb:- app/models/person.rb:207 #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:10 #: app/views/profile_editor/_person_form.rhtml:20 #: plugins/bsc/lib/bsc_plugin/contract.rb:46 @@ -1939,11 +1929,11 @@ msgstr "(удаленный пользователь)" msgid "(unauthenticated user)" msgstr "(неизвестный пользователь)" -#: app/models/comment.rb:179 +#: app/models/comment.rb:183 msgid "[%s] you got a new comment!" msgstr "[%s] вы получили новый комментарий" -#: app/models/comment.rb:194 +#: app/models/comment.rb:198 #, fuzzy msgid "[%s] %s commented on a content of %s" msgstr "Наиболее комментируемые статьи" @@ -2047,7 +2037,7 @@ msgstr "" msgid "cyclical reference is not allowed." msgstr "" -#: app/models/article.rb:170 app/models/organization.rb:99 +#: app/models/article.rb:170 app/models/organization.rb:101 msgid "Tag list" msgstr "Список тегов" @@ -2076,66 +2066,66 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/article.rb:605 +#: app/models/article.rb:609 #, fuzzy msgid "no comments" msgstr "Комментарий" -#: app/models/article.rb:606 +#: app/models/article.rb:610 #, fuzzy msgid "one comment" msgstr "Комментарий" -#: app/models/article.rb:607 +#: app/models/article.rb:611 #, fuzzy msgid "%s comments" msgstr "Опубликовать комментарий" -#: app/models/article.rb:614 +#: app/models/article.rb:618 msgid "no views" msgstr "" -#: app/models/article.rb:615 +#: app/models/article.rb:619 #, fuzzy msgid "one view" msgstr "один пункт" -#: app/models/article.rb:616 +#: app/models/article.rb:620 msgid "%s views" msgstr "" -#: app/models/article.rb:621 +#: app/models/article.rb:625 #, fuzzy msgid "Created at: " msgstr "Создано:" -#: app/models/article.rb:703 +#: app/models/article.rb:707 #, fuzzy msgid "Published date" msgstr "Опубликовать медиа-контент" -#: app/models/article.rb:703 +#: app/models/article.rb:707 msgid "Older than one year" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 #, fuzzy msgid "In the last year" msgstr "в галлерее" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last month" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last week" msgstr "" -#: app/models/article.rb:704 +#: app/models/article.rb:708 msgid "In the last day" msgstr "" -#: app/models/article.rb:707 app/helpers/application_helper.rb:614 +#: app/models/article.rb:711 app/helpers/application_helper.rb:614 #: app/views/search/_article_categories.rhtml:2 #: app/views/categories/index.rhtml:1 app/views/admin_panel/index.rhtml:41 #: app/views/content_viewer/view_page.rhtml:77 @@ -2433,16 +2423,21 @@ msgstr "" msgid "Redirects the user to his control panel." msgstr "Назад в контрольную панель" -#: app/models/environment.rb:579 +#: app/models/environment.rb:238 +#, fuzzy +msgid "This enterprise needs to be enabled." +msgstr "Ваша компания зоблокирована" + +#: app/models/environment.rb:580 msgid "Only one Virtual Community can be the default one" msgstr "Только виртуальное сообщество может быть выбранным по умолчанию" -#: app/models/environment.rb:842 +#: app/models/environment.rb:843 #, fuzzy msgid "is not available." msgstr "Продукт не доступен!" -#: app/models/environment.rb:850 +#: app/models/environment.rb:851 msgid "have unsupported languages." msgstr "" @@ -2683,9 +2678,9 @@ msgstr "внешняя лента" msgid "Feed title" msgstr "Название" -#: app/models/external_feed.rb:- app/models/person.rb:266 -#: app/models/person.rb:277 app/models/organization.rb:121 -#: app/models/organization.rb:132 app/models/blog.rb:13 app/models/blog.rb:17 +#: app/models/external_feed.rb:- app/models/person.rb:269 +#: app/models/person.rb:280 app/models/organization.rb:123 +#: app/models/organization.rb:134 app/models/blog.rb:13 app/models/blog.rb:17 #: app/models/enterprise.rb:129 app/models/enterprise.rb:145 msgid "Blog" msgstr "Блог" @@ -2798,8 +2793,8 @@ msgstr "Методика подтверждения" msgid "Restrictions" msgstr "Ограничения" -#: app/models/validation_info.rb:- app/models/person.rb:195 -#: app/views/profile_editor/_person_form.rhtml:60 +#: app/models/validation_info.rb:- app/models/person.rb:198 +#: app/views/profile_editor/_person_form.rhtml:62 msgid "Organization" msgstr "Организация" @@ -2835,110 +2830,127 @@ msgstr "школа" msgid "family" msgstr "семья" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:14 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:14 msgid "Cell phone" msgstr "Мобильный телефон" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:15 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:15 msgid "Comercial phone" msgstr "рабочий телефон" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:18 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:18 msgid "Nationality" msgstr "Национальность" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:27 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:29 msgid "Schooling" msgstr "Учеба" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:52 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:54 msgid "Area of study" msgstr "Облась изучния" -#: app/models/person.rb:195 app/views/profile_editor/_person_form.rhtml:59 +#: app/models/person.rb:198 app/views/profile_editor/_person_form.rhtml:61 msgid "Professional activity" msgstr "Профессиональная деятельность" -#: app/models/person.rb:195 app/models/enterprise.rb:23 -#: app/views/profile_editor/_person_form.rhtml:61 +#: app/models/person.rb:198 app/models/enterprise.rb:23 +#: app/views/profile_editor/_person_form.rhtml:63 msgid "Organization website" msgstr "Веб-сайт организации" -#: app/models/person.rb:198 +#: app/models/person.rb:201 msgid "Schooling status" msgstr "Учебный статус" -#: app/models/person.rb:201 app/helpers/profile_editor_helper.rb:26 -#: app/views/profile_editor/_person_form.rhtml:45 +#: app/models/person.rb:204 app/helpers/profile_editor_helper.rb:26 +#: app/views/profile_editor/_person_form.rhtml:47 msgid "Education" msgstr "Образование" -#: app/models/person.rb:201 +#: app/models/person.rb:204 #, fuzzy msgid "Custom education" msgstr "Пользовательское формирование" -#: app/models/person.rb:201 app/views/profile_editor/_person_form.rhtml:55 +#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:57 msgid "Custom area of study" msgstr "Пользовательская область изучения" -#: app/models/person.rb:204 app/views/profile_editor/_person_form.rhtml:12 +#: app/models/person.rb:207 app/views/profile_editor/_person_form.rhtml:12 msgid "Contact information" msgstr "Контактная информация" -#: app/models/person.rb:204 app/models/enterprise.rb:23 +#: app/models/person.rb:207 app/models/enterprise.rb:23 #: app/views/maps/edit_location.rhtml:9 -#: app/views/shared/_organization_custom_fields.rhtml:16 +#: app/views/shared/_organization_custom_fields.rhtml:18 #: app/views/profile_editor/_person_form.rhtml:19 #: plugins/bsc/views/shared/_fields.html.erb:65 msgid "Country" msgstr "Страна" -#: app/models/person.rb:204 +#: app/models/person.rb:207 msgid "Sex" msgstr "Пол" -#: app/models/person.rb:204 +#: app/models/person.rb:207 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 msgid "Zip code" msgstr "Почтовый индекс" -#: app/models/person.rb:235 +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:14 +#: app/views/profile_editor/_person_form.rhtml:25 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:17 +#, fuzzy +msgid "District" +msgstr "Ограничения" + +#: app/models/person.rb:207 app/models/organization.rb:101 +#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/profile_editor/_person_form.rhtml:24 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:16 +#, fuzzy +msgid "Address reference" +msgstr "Адрес:" + +#: app/models/person.rb:238 msgid "%{fn} is already used by other user" msgstr "%{fn} уже используется другим юзером" -#: app/models/person.rb:264 app/models/organization.rb:120 +#: app/models/person.rb:267 app/models/organization.rb:122 msgid "Image gallery" msgstr "Галерея рисунков" -#: app/models/person.rb:265 app/models/organization.rb:119 +#: app/models/person.rb:268 app/models/organization.rb:121 #: app/helpers/application_helper.rb:532 app/helpers/application_helper.rb:541 msgid "Agenda" msgstr "Повестка дня" -#: app/models/person.rb:278 app/models/gallery.rb:4 app/models/gallery.rb:8 -#: app/models/organization.rb:133 app/views/search/_uploaded_file.rhtml:14 +#: app/models/person.rb:281 app/models/gallery.rb:4 app/models/gallery.rb:8 +#: app/models/organization.rb:135 app/views/search/_uploaded_file.rhtml:14 #, fuzzy msgid "Gallery" msgstr "Галерея рисунков" -#: app/models/person.rb:390 +#: app/models/person.rb:393 msgid "none" msgstr "нет" -#: app/models/person.rb:391 +#: app/models/person.rb:394 msgid "one friend" msgstr "один друг" -#: app/models/person.rb:392 +#: app/models/person.rb:395 msgid "%s friends" msgstr "%s: друзей" -#: app/models/person.rb:427 +#: app/models/person.rb:430 msgid "You just left %s." msgstr "Вы только что покинули %s." -#: app/models/person.rb:451 app/models/profile.rb:868 +#: app/models/person.rb:454 app/models/profile.rb:876 #, fuzzy msgid "Edit Profile" msgstr "Редактировать профиль" @@ -3029,72 +3041,72 @@ msgstr "Пригласить участников" msgid "Send e-Mail to members" msgstr "Послать e-mail участникам" -#: app/models/profile.rb:301 +#: app/models/profile.rb:305 #, fuzzy msgid "is not a template." msgstr "Использовать этот шаблон" -#: app/models/profile.rb:613 +#: app/models/profile.rb:621 #, fuzzy msgid "%s can't have members" msgstr "%s не может иметь участников" -#: app/models/profile.rb:634 +#: app/models/profile.rb:642 msgid "%s can't has moderators" msgstr "%s не может иметь модераторов" -#: app/models/profile.rb:715 +#: app/models/profile.rb:723 msgid "Private profile" msgstr "Приватный профиль" -#: app/models/profile.rb:812 +#: app/models/profile.rb:820 msgid "Since: " msgstr "С:" -#: app/models/profile.rb:827 +#: app/models/profile.rb:835 #, fuzzy msgid "no activity" msgstr "Экономическая активность" -#: app/models/profile.rb:828 +#: app/models/profile.rb:836 #, fuzzy msgid "one activity" msgstr "Экономическая активность" -#: app/models/profile.rb:829 +#: app/models/profile.rb:837 #, fuzzy msgid "%s activities" msgstr "деятельность %s" -#: app/models/profile.rb:835 +#: app/models/profile.rb:843 #, fuzzy msgid "no members" msgstr "один участник" -#: app/models/profile.rb:836 +#: app/models/profile.rb:844 msgid "one member" msgstr "один участник" -#: app/models/profile.rb:837 +#: app/models/profile.rb:845 msgid "%s members" msgstr "%s участников" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 #, fuzzy msgid "facets|Enabled" msgstr "Разрешено" -#: app/models/profile.rb:922 +#: app/models/profile.rb:930 #, fuzzy msgid "facets|Not enabled" msgstr "%s не позволено" -#: app/models/profile.rb:940 +#: app/models/profile.rb:948 #, fuzzy msgid "Situation" msgstr "Текст приглашения" -#: app/models/profile.rb:970 +#: app/models/profile.rb:978 msgid "Profile Info and settings" msgstr "Инфо профиля и настройки" @@ -3134,7 +3146,7 @@ msgstr "Квалификатор" msgid "Certifier" msgstr "Серитфикатор" -#: app/models/unit.rb:- app/views/catalog/index.rhtml:37 +#: app/models/unit.rb:- app/views/catalog/index.rhtml:59 msgid "unit" msgstr "единица" @@ -3540,23 +3552,23 @@ msgstr "Категории профиля" msgid "profilecategorization" msgstr "Категоризация профиля" -#: app/models/create_enterprise.rb:7 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:101 msgid "Contact person" msgstr "Контактное лицо" -#: app/models/create_enterprise.rb:9 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:101 msgid "Foundation year" msgstr "Год создания" -#: app/models/create_enterprise.rb:10 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:101 msgid "Legal form" msgstr "Правовая форма" -#: app/models/create_enterprise.rb:11 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:101 msgid "Economic activity" msgstr "Экономическая активность" -#: app/models/create_enterprise.rb:12 app/models/organization.rb:99 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:101 msgid "Management information" msgstr "Информация о менеджменте" @@ -3693,16 +3705,16 @@ msgid " is inviting you to join \"\" on ." msgstr "" " приглашает Вас присоединиться к \"\" в ." -#: app/models/organization.rb:99 +#: app/models/organization.rb:101 msgid "Display name" msgstr "Отображаемое имя" -#: app/models/organization.rb:117 +#: app/models/organization.rb:119 #, fuzzy msgid "Community's profile" msgstr "Сообщества" -#: app/models/organization.rb:118 +#: app/models/organization.rb:120 #, fuzzy msgid "Invite Friends" msgstr "Пригласить друзей" @@ -3806,9 +3818,9 @@ msgid "Activities short description" msgstr "Краткое описание занятий" #: app/models/enterprise.rb:23 app/views/maps/edit_location.rhtml:12 -#: app/views/shared/_organization_custom_fields.rhtml:13 +#: app/views/shared/_organization_custom_fields.rhtml:15 #: app/views/profile_editor/_person_form.rhtml:22 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:13 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:19 msgid "ZIP code" msgstr "Почтовый индекс" @@ -4452,11 +4464,11 @@ msgstr "Занят" msgid "Sign out of chat" msgstr "Выйти из чата" -#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:12 +#: app/helpers/display_helper.rb:4 app/helpers/display_helper.rb:20 msgid "No product" msgstr "Нет продукта" -#: app/helpers/display_helper.rb:59 +#: app/helpers/display_helper.rb:67 msgid "Are you sure you want to visit this web site?" msgstr "Вы уверены что хотите перейти на этот веб-сайт?" @@ -4751,7 +4763,7 @@ msgstr "%{distance} дней" msgid "Source: %s" msgstr "Источник: %s" -#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:17 +#: app/helpers/application_helper.rb:1252 app/views/catalog/index.rhtml:39 #: app/views/search/_image.rhtml:43 app/views/cms/_text_editor_sidebar.rhtml:3 #: app/views/manage_products/_display_image.rhtml:6 #, fuzzy @@ -4810,6 +4822,14 @@ msgstr "" msgid "Type in a search term" msgstr "Отключить поиск по компаниям" +#: app/helpers/application_helper.rb:1418 +msgid "The content here is available to %s's friends only." +msgstr "%s ограничивает доступ к данной информации только кругом друзей." + +#: app/helpers/application_helper.rb:1421 +msgid "The contents in this community is available to members only." +msgstr "Ктонтент єтого сообщества доступен только его членам." + #: app/helpers/events_helper.rb:4 msgid "Select a day on the left to display it's events here" msgstr "Выберите слева день, чтоб отобразить его события тут" @@ -4965,6 +4985,11 @@ msgstr "Распространить это" msgid "Delete" msgstr "Удалить" +#: app/helpers/catalog_helper.rb:7 +#, fuzzy +msgid "Start" +msgstr "Дата начала" + #: app/helpers/blog_helper.rb:10 msgid "New post" msgstr "Новый пост" @@ -5666,55 +5691,65 @@ msgstr "" msgid "I want to receive a copy of the message in my e-mail." msgstr "Получить копию на email" -#: app/views/catalog/index.rhtml:5 app/views/blocks/profile_info.rhtml:21 +#: app/views/catalog/index.rhtml:4 app/views/blocks/profile_info.rhtml:21 #: app/views/profile/_organization_profile.rhtml:26 msgid "Products/Services" msgstr "Продукты/Сервисы" -#: app/views/catalog/index.rhtml:20 app/views/search/_image.rhtml:35 +#: app/views/catalog/index.rhtml:16 +#, fuzzy +msgid "There are no sub-categories for %s" +msgstr "Нет категорий" + +#: app/views/catalog/index.rhtml:34 +#, fuzzy +msgid "Highlighted product" +msgstr "Выделить этот продукт" + +#: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35 #: app/views/search/_image.rhtml:47 #, fuzzy msgid "No image" msgstr "изображение" -#: app/views/catalog/index.rhtml:30 +#: app/views/catalog/index.rhtml:52 msgid "from " msgstr "" -#: app/views/catalog/index.rhtml:31 +#: app/views/catalog/index.rhtml:53 #, fuzzy msgid "by " msgstr "от" -#: app/views/catalog/index.rhtml:37 +#: app/views/catalog/index.rhtml:59 msgid " / " msgstr "" -#: app/views/catalog/index.rhtml:45 +#: app/views/catalog/index.rhtml:67 #, fuzzy msgid "description" msgstr "Описание" -#: app/views/catalog/index.rhtml:55 +#: app/views/catalog/index.rhtml:77 #, fuzzy msgid "price composition" msgstr "Настройки приватности" -#: app/views/catalog/index.rhtml:78 +#: app/views/catalog/index.rhtml:100 #, fuzzy msgid "inputs and raw materials" msgstr "Составляющие и исходники" -#: app/views/catalog/index.rhtml:84 +#: app/views/catalog/index.rhtml:106 msgid "%{amount_used} %{unit} of" msgstr "" -#: app/views/catalog/index.rhtml:95 +#: app/views/catalog/index.rhtml:117 #, fuzzy msgid "qualifiers" msgstr "определитель" -#: app/views/catalog/index.rhtml:103 +#: app/views/catalog/index.rhtml:125 #, fuzzy msgid "product unavailable" msgstr "Продукт не доступен!" @@ -5801,7 +5836,7 @@ msgstr "Управлять%s" #: app/views/profile_editor/edit.rhtml:64 app/views/cms/view.rhtml:9 #: app/views/tasks/index.rhtml:37 app/views/tasks/index.rhtml:62 #: app/views/box_organizer/index.rhtml:5 -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:43 msgid "Back to control panel" msgstr "Назад в панель управления" @@ -5966,7 +6001,7 @@ msgstr "Расположение:" #: app/views/maps/edit_location.rhtml:13 #: app/views/shared/_organization_custom_fields.rhtml:12 #: app/views/profile_editor/_person_form.rhtml:23 -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:11 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15 msgid "Address (street and number)" msgstr "Адрес" @@ -6415,22 +6450,18 @@ msgid "Supplier" msgstr "Поставщик: %s" #: app/views/search/index.rhtml:7 app/views/search/category_index.rhtml:7 -#: plugins/solr/views/solr_plugin_public/index.rhtml:7 msgid "Search Results" msgstr "Результаты поиска" #: app/views/search/index.rhtml:14 app/views/search/category_index.rhtml:14 -#: plugins/solr/views/solr_plugin_public/index.rhtml:14 msgid "Sub-categories" msgstr "Подкатегории" #: app/views/search/index.rhtml:16 app/views/search/category_index.rhtml:16 -#: plugins/solr/views/solr_plugin_public/index.rhtml:16 msgid "No sub-categories" msgstr "Не яаляется подкатегорией" #: app/views/search/_facets_unselect_menu.rhtml:3 -#: plugins/solr/views/search/_facets_unselect_menu.rhtml:3 #, fuzzy msgid "Applied filters" msgstr "Загруженные файлы" @@ -7346,7 +7377,7 @@ msgstr "Никнэйм" msgid "Home phone" msgstr "Домашний телефон" -#: app/views/profile_editor/_person_form.rhtml:48 +#: app/views/profile_editor/_person_form.rhtml:50 #, fuzzy msgid "Custom formation" msgstr "Пользовательское формирование" @@ -10208,7 +10239,7 @@ msgid "[%s] Bsc management transferred to you." msgstr "" #: plugins/bsc/lib/bsc_plugin/contract.rb:33 -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Opened" msgstr "открыть" @@ -10473,107 +10504,118 @@ msgstr "" msgid "The tolerance time for editing this content is over." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:10 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:13 #, fuzzy msgid "Option updated successfully." msgstr "Возможности успешно обновлены" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:12 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb:15 #, fuzzy msgid "Option wasn't updated successfully." msgstr "Возможности успешно обновлены" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:98 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:116 msgid "Request sent successfully. Check your email." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:121 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:139 #, fuzzy msgid "Basket displayed." msgstr "Не отображать" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:140 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:158 msgid "Basket hidden." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:162 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:186 +#, fuzzy +msgid "Delivery option updated." +msgstr "Уничтожить профиль" + +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:199 msgid "Can't join items from different enterprises." msgstr "" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:176 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:213 #, fuzzy msgid "There is no basket." msgstr "Нет категорий" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:192 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:229 #, fuzzy msgid "This enterprise doesn't have this product." msgstr "Компания не может быть активирована" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:206 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:243 #, fuzzy msgid "The basket doesn't have this product." msgstr "Компания не может быть активирована" -#: plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb:220 +#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:257 msgid "Invalid quantity." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:11 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:12 #, fuzzy msgid "A shopping basket feature for enterprises" msgstr "Отключить поиск по компаниям" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:17 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:37 #, fuzzy msgid "Add to basket" msgstr "Добавить контакт" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:44 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:65 #, fuzzy msgid "Shopping basket" msgstr "Учебный статус" -#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:47 +#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:68 msgid "Purchase reports" msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:8 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:10 #, fuzzy msgid "[%s] Your buy request was performed successfully." msgstr "Ваш запрос на публикацию успешно отправлен" -#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:21 +#: plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb:25 msgid "[%s] You have a new buy request from %s." msgstr "" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:22 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41 +#, fuzzy +msgid "Free delivery" +msgstr "Получатель" + +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7 #, fuzzy msgid "Delivery" msgstr "Получатель" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:35 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53 #, fuzzy msgid "Item name" msgstr "Имя файла" -#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:52 +#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76 #: plugins/shopping_cart/views/cart.html.erb:9 #, fuzzy msgid "Total:" msgstr "Получатель:" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Canceled" msgstr "Отменено" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Confirmed" msgstr "Подтвердить" -#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:34 +#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:38 #, fuzzy msgid "Shipped" msgstr "Поток" @@ -11479,6 +11521,27 @@ msgstr "" msgid "E-mail" msgstr "E-Mail" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9 +#, fuzzy +msgid "Delivery option" +msgstr "Уничтожить профиль" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Payment" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:11 +#, fuzzy +msgid "Change" +msgstr "Сменить изобрежение" + #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:1 #, fuzzy msgid "Basket options" @@ -11488,11 +11551,30 @@ msgstr "Еще опции" msgid "Delivery?" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:6 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:10 +msgid "Option" +msgstr "Опции" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:24 +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:32 +#, fuzzy +msgid "Remove option" +msgstr "Еще опции" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:27 +msgid "ADD NEW OPTION" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:36 #, fuzzy -msgid "Delivery price:" +msgid "Free delivery price:" msgstr "Уничтожить профиль" +#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:37 +msgid "Empty stands for no free delivery price." +msgstr "" + #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10 msgid "This is a notification e-mail about your buy request on %s." msgstr "" @@ -11518,17 +11600,30 @@ msgstr "" msgid "Phone number" msgstr "один участник" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:37 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +msgid "Money" +msgstr "" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10 +#, fuzzy +msgid "Check" +msgstr "Выбрать все" + +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47 msgid "Here are the products you bought:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51 #, fuzzy msgid "Thanks for buying with us!" msgstr "Спасибо за регистрацию!" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:45 -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:42 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51 msgid "A service of %s." msgstr "" @@ -11541,25 +11636,25 @@ msgstr "Это републикация \"%s\", от %s." msgid "Below follows the customer informations:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:35 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45 msgid "And here are the items bought by this customer:" msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:40 +#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49 msgid "If there are any problems with this email contact the admin of %s." msgstr "" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:14 #, fuzzy msgid "Delivery Address" msgstr "Адрес ленты" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16 +#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:23 #, fuzzy msgid "Send buy request" msgstr "Новый запрос" -#: plugins/shopping_cart/views/shopping_cart_plugin_profile/send_request.html.erb:1 +#: plugins/shopping_cart/views/shopping_cart_plugin/send_request.html.erb:1 msgid "Request sent successfully check your email." msgstr "" @@ -11701,9 +11796,6 @@ msgstr "" #~ msgid "Remove this comment and all its replies" #~ msgstr "Удалить комментарий" -#~ msgid "Option" -#~ msgstr "Опции" - #~ msgid "What's new" #~ msgstr "Что нового" @@ -11816,9 +11908,6 @@ msgstr "" #~ msgid "product categorization" #~ msgstr "категоризация продукта" -#~ msgid "There is no categories." -#~ msgstr "Нет категорий" - #~ msgid "Listing sellers of %s witin %s km from %s %s" #~ msgstr "Просмотреть поставщиков %s находящихся в %s километрах от %s" diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 9c271ee..6e54dd9 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -29,7 +29,14 @@ function focus_first_field() { /* * * Convert a string to a valid login name * * */ function convToValidLogin( str ) { - return convToValidIdentifier(str, '') + if (str.indexOf('@') == -1) + return convToValidUsername(str); + else + return convToValidEmail(str); +} + +function convToValidUsername( str ) { + return convToValidIdentifier(str, ''); } /* * * Convert a string to a valid login name * * */ @@ -46,6 +53,18 @@ function convToValidIdentifier( str, sep ) { .replace( /[^-_a-z0-9.]+/g, sep ) } +function convToValidEmail( str ) { + return str.toLowerCase() + .replace( /á|à|ã|â/g, "a" ) + .replace( /é|ê/g, "e" ) + .replace( /í/g, "i" ) + .replace( /ó|ô|õ|ö/g, "o" ) + .replace( /ú|ũ|ü/g, "u" ) + .replace( /ñ/g, "n" ) + .replace( /ç/g, "c" ) + .replace( /[^@a-z0-9!#$%&'*+-/=?^_`{|}~.]+/g, '' ) +} + function updateUrlField(name_field, id) { url_field = $(id); old_url_value = url_field.value; @@ -110,9 +129,9 @@ function hideOthersIconSelector(current_div) { } function loading(element_id, message) { - $(element_id).addClassName('loading'); + jQuery(element_id).addClass('loading'); if (message) { - $(element_id).update(message); + jQuery(element_id).html(message); } } function small_loading(element_id, message) { @@ -122,9 +141,9 @@ function small_loading(element_id, message) { } } function loading_done(element_id) { - $(element_id).removeClassName('loading'); - $(element_id).removeClassName('small-loading'); - $(element_id).removeClassName('small-loading-dark'); + jQuery(element_id).removeClass('loading'); + jQuery(element_id).removeClass('small-loading'); + jQuery(element_id).removeClass('small-loading-dark'); } function open_loading(message) { jQuery('body').append("