diff --git a/Gemfile b/Gemfile index aac9f139..3659d7e1 100644 --- a/Gemfile +++ b/Gemfile @@ -25,11 +25,8 @@ gem 'addressable', :require => ['addressable/template', 'addressable/uri'] gem 'whenever', '~> 0.7.3', :require => false -gem 'swf_converter', '~> 0.0.3' - gem 'resque', '~> 1.23.0' gem 'resque-scheduler', '~> 2.0.0.d' -gem 'resque-retry', '~> 0.1.0' gem 'right_aws', '~> 2.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 0ab4f343..cac1d946 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,9 +206,6 @@ GEM redis-namespace (~> 1.0) sinatra (>= 0.9.2) vegas (~> 0.1.2) - resque-retry (0.1.0) - resque (>= 1.8.0) - resque-scheduler (>= 1.8.0) resque-scheduler (2.0.1) redis (>= 2.0.1) resque (>= 1.20.0) @@ -256,7 +253,6 @@ GEM sprockets (>= 2.8, < 4.0) ssrf_filter (1.0.8) subexec (0.2.3) - swf_converter (0.0.3) temple (0.8.2) thor (1.2.2) thread_safe (0.3.6) @@ -309,7 +305,6 @@ DEPENDENCIES rdiscount (~> 1.6.5) react-rails (~> 2.7, >= 2.7.1) resque (~> 1.23.0) - resque-retry (~> 0.1.0) resque-scheduler (~> 2.0.0.d) rest-client (~> 1.6.7) right_aws (~> 2.1.0) @@ -317,7 +312,6 @@ DEPENDENCIES rvm-capistrano (~> 1.5.6) sanitize (~> 2.0.3) sass-rails (~> 5.0, >= 5.0.7) - swf_converter (~> 0.0.3) uglifier (~> 4.2) whenever (~> 0.7.3) will_paginate (~> 3.0.pre2) diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 940ed703..6f8632a6 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -9,7 +9,6 @@ @import partials/jquery.jgrowl -@import broken_image_reports/new @import campaigns/show @import closet_hangers/index @import closet_hangers/petpage diff --git a/app/assets/stylesheets/broken_image_reports/_new.sass b/app/assets/stylesheets/broken_image_reports/_new.sass deleted file mode 100644 index c66622a9..00000000 --- a/app/assets/stylesheets/broken_image_reports/_new.sass +++ /dev/null @@ -1,12 +0,0 @@ -@import partials/assets-list - -body.broken_image_reports-new - - #report-assets - +assets-list - - span - font-size: 85% - - .manual a - display: block diff --git a/app/controllers/broken_image_reports_controller.rb b/app/controllers/broken_image_reports_controller.rb deleted file mode 100644 index e911b5bb..00000000 --- a/app/controllers/broken_image_reports_controller.rb +++ /dev/null @@ -1,22 +0,0 @@ -class BrokenImageReportsController < ApplicationController - def new - @swf_assets = SwfAsset.from_wardrobe_link_params(params[:asset_ids]).where(:has_image => true) - end - - def create - swf_asset = SwfAsset.where(:type => params[:swf_asset_type]). - find_by_remote_id(params[:swf_asset_remote_id]) - - if swf_asset.image_manual? - flash[:warning] = t('broken_image_reports.create.manual') - else - # If the asset is already reported as broken, no need to shout about it. - # Just don't enqueue it, thank the user, and move on. - swf_asset.report_broken - flash[:success] = t('broken_image_reports.create.success') - end - - redirect_to :back - end -end - diff --git a/app/controllers/swf_assets_controller.rb b/app/controllers/swf_assets_controller.rb index efd167ec..8713837f 100644 --- a/app/controllers/swf_assets_controller.rb +++ b/app/controllers/swf_assets_controller.rb @@ -48,7 +48,6 @@ class SwfAssetsController < ApplicationController end if @swf_assets @swf_assets = @swf_assets.all unless @swf_assets.is_a? Array - @swf_assets.each(&:request_image_conversion!) json = @swf_assets unless json else json = nil diff --git a/app/helpers/broken_image_reports_helper.rb b/app/helpers/broken_image_reports_helper.rb deleted file mode 100644 index 3c52fe26..00000000 --- a/app/helpers/broken_image_reports_helper.rb +++ /dev/null @@ -1,11 +0,0 @@ -module BrokenImageReportsHelper - def format_converted_at(converted_at) - translate 'broken_image_reports.new.converted_at_html', - :converted_at_ago => labeled_time_ago_in_words(converted_at) - end - - def format_reported_at(reported_at) - translate 'broken_image_reports.new.reported_at_html', - :reported_at_ago => labeled_time_ago_in_words(reported_at) - end -end diff --git a/app/models/asset_image_conversion_request.rb b/app/models/asset_image_conversion_request.rb deleted file mode 100644 index a2771321..00000000 --- a/app/models/asset_image_conversion_request.rb +++ /dev/null @@ -1,35 +0,0 @@ -require 'resque-retry' -require 'timeout' - -class AssetImageConversionRequest - TIMEOUT_IN_SECONDS = 30 - - extend Resque::Plugins::Retry - - @retry_limit = 5 - @retry_delay = 60 - - @queue = :requested_asset_images - - def self.perform(asset_id) - Timeout::timeout(TIMEOUT_IN_SECONDS) do - asset = SwfAsset.find(asset_id) - asset.convert_swf_if_not_converted! - end - end - - class OnCreation < AssetImageConversionRequest - @retry_limit = 5 - @retry_delay = 60 - - @queue = :requested_asset_images_on_creation - end - - class OnBrokenImageReport < AssetImageConversionRequest - @retry_limit = 5 - @retry_delay = 60 - - @queue = :reportedly_broken_asset_images - end -end - diff --git a/app/models/swf_asset.rb b/app/models/swf_asset.rb index 1a9be536..aed5634c 100644 --- a/app/models/swf_asset.rb +++ b/app/models/swf_asset.rb @@ -24,9 +24,6 @@ class SwfAsset < ActiveRecord::Base :medium => [300, 300], :large => [600, 600] } - - include SwfConverter - converts_swfs :size => IMAGE_SIZES[:large], :output_sizes => IMAGE_SIZES.values belongs_to :zone has_many :parent_swf_asset_relationships @@ -105,47 +102,6 @@ class SwfAsset < ActiveRecord::Base IMAGE_SIZES.values.map { |size| {:size => size, :url => image_url(size)} } end - def convert_swf_if_not_converted! - if needs_conversion? - convert_swf! - true - else - false - end - end - - def request_image_conversion! - if image_requested? - false - else - Resque.enqueue(AssetImageConversionRequest, self.id) - self.image_requested = true - save! - true - end - end - - def report_broken - if image_pending_repair? - return false - end - - Resque.enqueue(AssetImageConversionRequest::OnBrokenImageReport, self.id) - self.reported_broken_at = Time.now - self.save - end - - def needs_conversion? - !has_image? || image_pending_repair? - end - - REPAIR_PENDING_EXPIRES = 1.hour - def image_pending_repair? - reported_broken_at && - (converted_at.nil? || reported_broken_at > converted_at) && - reported_broken_at > REPAIR_PENDING_EXPIRES.ago - end - attr_accessor :item has_one :contribution, :as => :contributed, :inverse_of => :contributed @@ -307,10 +263,6 @@ class SwfAsset < ActiveRecord::Base self.body_id = 0 if !@body_id_overridden && (!self.body_specific? || (!self.new_record? && self.body_id_changed?)) end - after_commit :on => :create do - Resque.enqueue(AssetImageConversionRequest::OnCreation, self.id) - end - class DownloadError < Exception;end private diff --git a/app/views/broken_image_reports/new.html.haml b/app/views/broken_image_reports/new.html.haml deleted file mode 100644 index d27ad34a..00000000 --- a/app/views/broken_image_reports/new.html.haml +++ /dev/null @@ -1,24 +0,0 @@ -- title t('.title') - -%p= t '.explanation_html', :contact_link => mail_to(contact_email) - -%p= t '.call_to_action' - -%ul#report-assets - - @swf_assets.each do |swf_asset| - %li - = link_to image_tag(swf_asset.image_url([150, 150])), swf_asset.url - - if swf_asset.image_manual? - %span.manual - = t '.image_manual.description' - = mail_to contact_email, t('.image_manual.contact') - - elsif swf_asset.image_pending_repair? - %span.reported-broken-at= format_reported_at(swf_asset.reported_broken_at) - - else - = form_tag(action: :create) do - = hidden_field_tag 'swf_asset_remote_id', swf_asset.remote_id - = hidden_field_tag 'swf_asset_type', swf_asset.type - = submit_tag t('.submit') - - - if swf_asset.converted_at? - %span.converted-at= format_converted_at(swf_asset.converted_at) diff --git a/app/views/outfits/edit.html.haml b/app/views/outfits/edit.html.haml index 2ff574dd..612f964f 100644 --- a/app/views/outfits/edit.html.haml +++ b/app/views/outfits/edit.html.haml @@ -39,8 +39,6 @@ = link_to t('.preview.download'), 'javascript:void(0)', id: 'preview-mode-download' = link_to t('.preview.swf_links'), 'javascript:void(0)', id: 'swf-links', target: '_blank', 'data-base-url' => links_swf_assets_path - = link_to t('.preview.mode.image.report_broken'), 'javascript:void(0)', - :id => 'report-broken-image', :target => '_blank', 'data-base-url' => new_broken_image_report_path #preview-sidebar %nav#preview-sidebar-navbar #preview-sidebar-navbar-closet= t '.sidebar.nav.closet' diff --git a/config/initializers/resque_retry.rb b/config/initializers/resque_retry.rb deleted file mode 100644 index 2a7902fe..00000000 --- a/config/initializers/resque_retry.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'resque-retry' -require 'resque/failure/redis' - -Resque::Failure::MultipleWithRetrySuppression.classes = [Resque::Failure::Redis] -Resque::Failure.backend = Resque::Failure::MultipleWithRetrySuppression - diff --git a/config/locales/en-MEEP.yml b/config/locales/en-MEEP.yml index 686df6b2..d0f1eabf 100644 --- a/config/locales/en-MEEP.yml +++ b/config/locales/en-MEEP.yml @@ -44,15 +44,6 @@ en-MEEP: items: title_tagline: Neopets customization meep and meepits database search: Meep - - broken_image_reports: - create: - success: - Thanks! This image will be remeeped soon. If it looks the same after - meeping, please consider sending a bug report. - already_reported: - This image is already in line for remeeping. We'll get to it soon, - don't worry. new: title: Meep broken image diff --git a/config/locales/en.yml b/config/locales/en.yml index 3580c63f..d1a19017 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5,20 +5,20 @@ en: infinite_closet: Infinite Closet modeling_hub: Modeling Hub locale_name: English - + activerecord: attributes: closet_list: name: Name description: Description - + user: contact_neopets_connection_id: Send Neomail to - + layouts: application: title_tagline: Preview customized Neopets' clothing and wearables - + userbar: greeting: Hey, %{user_name}! contributions_summary: @@ -29,7 +29,7 @@ en: settings: Settings logout: Log out login: Log in - + footer: blog: Blog source_code: Source Code @@ -37,24 +37,13 @@ en: contact: Contact suggestions: Suggestions email: Questions, comments, bugs - copyright: - Images © 2000–%{year} Neopets, Inc. All Rights Reserved. + copyright: Images © 2000–%{year} Neopets, Inc. All Rights Reserved. Used With Permission - + items: title_tagline: Neopets customization clothing and wearables database search: Search - - broken_image_reports: - create: - success: - Thanks! This image will be reconverted soon. If it looks the same after - conversion, please consider sending a bug report. - manual: - This image was uploaded manually, so we don't want to run the - automatic converters on it. If this manual version is broken, let us - know at webmaster@openneo.net. Thanks! - + new: title: Report broken image explanation_html: @@ -62,8 +51,7 @@ en: don't get things quite right, and sometimes that can be fixed by just trying the conversion again. If reconversion doesn't seem to solve the issue, consider sending us a bug report at %{contact_link}. Thanks! - call_to_action: - Which of these images looked broken? + call_to_action: Which of these images looked broken? We'll put it in line for reconversion. submit: Report as broken converted_at_html: Converted %{converted_at_ago} ago @@ -71,26 +59,24 @@ en: image_manual: description: Uploaded manually. contact: Send a bug report? - + closet_hangers: closet_hanger: submit: Save delete: Remove - + create: success: owned: - in_list: - Success! You own %{count} of the %{item_name} in the %{list_name} list. + in_list: Success! You own %{count} of the %{item_name} in the %{list_name} list. unlisted: Success! You own %{count} of the %{item_name}. wanted: - in_list: - Success! You want %{count} of the %{item_name} in the %{list_name} list. + in_list: Success! You want %{count} of the %{item_name} in the %{list_name} list. unlisted: Success! You want %{count} of the %{item_name}. invalid: owned: "We couldn't save how many %{item_name} you own: %{errors}" wanted: "We couldn't save how many %{item_name} you want: %{errors}" - + destroy: success: owned: Success! You do not own the %{item_name}. @@ -98,7 +84,7 @@ en: destroy_all: success: Success! Removed all items from the list. - + index: title_for: you: Your Items @@ -109,8 +95,8 @@ en: send_neomail: Neomail %{neopets_username} lookup: "%{neopets_username}'s lookup" neopets_username: - new: 'Add username…' - prompt: 'What Neopets username should we add?' + new: "Add username…" + prompt: "What Neopets username should we add?" submit: Save public_url_label: "Public URL:" import_from: @@ -129,16 +115,15 @@ en: header: (Not in a list) empty: There aren't any items here. remove_all: - confirm: 'Remove all items from this list?' + confirm: "Remove all items from this list?" submit: Remove all select_all: Select all autocomplete: add_item_html: Add %{item_name} add_to_list_html: Add to %{list_name} add_to_group_html: Add to %{group_name}, no list - already_in_collection_html: - It's already in %{collection_name} - + already_in_collection_html: It's already in %{collection_name} + petpage: title: Export to petpage your_items_link: Back to Your Items @@ -149,16 +134,15 @@ en: have to be. The HTML is flexible, so, if you're the artsy type, you're free to mess with the styles all you want! instructions: - main_html: - Copy the HTML from the box below, then paste it into + main_html: Copy the HTML from the box below, then paste it into %{edit_petpage_link}. Then head to the Neoboards to show off! Have fun! edit_petpage_link_content: your pet's page - + petpage_content: unlisted_header: (Not in a list) footer: I made this list on Dress to Impress. You can, too! - + visibility: private: name: Private @@ -175,25 +159,23 @@ en: description: items: These items will be publicly listed for trades list: Items in this list will be publicly listed for trades - + update_quantities: success: Successfully saved how many of the %{item_name} you own and want. invalid: "We couldn't save those quantities: %{errors}" - + closet_lists: closet_list: submit: Save edit: Edit delete: Delete delete_confirmation: - owned: - Are you sure you want to delete "%{list_name}"? + owned: Are you sure you want to delete "%{list_name}"? If you do, we'll move these items into Items You Own, not in a list. - wanted: - Are you sure you want to delete "%{list_name}"? + wanted: Are you sure you want to delete "%{list_name}"? If you do, we'll move these items into Items You Want, not in a list. remove_all: - confirm: 'Remove all items from this list?' + confirm: "Remove all items from this list?" submit: Remove all select_all: Select all empty: This list is empty. @@ -203,10 +185,10 @@ en: to hear from those people, set a Neomail address at the top of the page. (If not, maybe you want a Public list instead of Trading.) - + edit: title: Editing list "%{list_name}" - + form: your_items_link: Back to Your Items name: @@ -219,23 +201,22 @@ en: hint: Why are these items in the same list? What are your terms for trading? Or you can leave this blank. - markup_hint_html: - We _support_ **Markdown** and some HTML. + markup_hint_html: We _support_ **Markdown** and some HTML. submit: Save list - + groups: owned_by: - you: Items you own + you: Items you own another_user: Items %{user_name} owns wanted_by: you: Items you want another_user: Items %{user_name} wants - + new: title: Create an items list - + unlisted_name: Not in a list - + colors: default_human_name: (a new color) prank_suffix: (fake) @@ -261,16 +242,16 @@ en: swf_asset_html: "%{item_description} on a new body type" pet_type_html: "%{pet_type_description} for the first time" pet_state_html: "a new pose for %{pet_type_description}" - + contribution: description_html: "%{user_link} showed us %{contributed_description}" created_at_html: "%{created_at_ago} ago" - + index: title: Recent Contributions user_summary: "%{user_name} currently has %{user_points} points" no_contributions: There are no contributions here. - + items: index: title_with_query: Searching Infinite Closet for "%{query}" @@ -297,7 +278,7 @@ en: nc: query: blue is:nc description: returns any NC Mall item with the word "blue" in it - pb: + pb: query: collar -is:pb description: returns any item with the word "collar" in it that isn't from a @@ -314,7 +295,7 @@ en: header: Newest items species_search: header: Can't decide? Search by species - + item: nc: abbr: NC @@ -325,7 +306,7 @@ en: wanted: abbr: Wanted description: You want this item - + show: rarity: Rarity resources: @@ -357,18 +338,16 @@ en: preview: header: Preview customize_more: Customize more - requirements_not_met: - Javascript and Flash are required to preview wearables. + requirements_not_met: Javascript and Flash are required to preview wearables. not_found: - main_html: - We've never seen the %{item_name} on the %{color_name} + main_html: We've never seen the %{item_name} on the %{color_name} %{species_name} before. Have you? If so, please %{modeling_link} and we'll update our database instantly. Thanks! modeling_link_content: model it for us contributors: header: Brought to you by footer: Thanks! - + search: errors: user_filters_disabled: @@ -376,8 +355,7 @@ en: tough on the server. They'll be back soon. Thanks for understanding. not_found: label: Filter "%{label}" does not exist. Is it spelled correctly? - species: - Species "%{species_name}" does not exist. Is it spelled correctly? + species: Species "%{species_name}" does not exist. Is it spelled correctly? zone: Zone "%{zone_name}" does not exist. Is it spelled correctly? ownership: I don't know what user:%{keyword} means. Did you mean user:owns or @@ -385,8 +363,7 @@ en: pet_type: We have no record of the %{name1} %{name2}. It is spelled correctly? pet_type_id: We have no record of pet type %{id}. Weird. - not_logged_in: - The "user" filters are only available if you're logged in. + not_logged_in: The "user" filters are only available if you're logged in. flag_keywords: is: is labels: @@ -400,7 +377,7 @@ en: user_owns: owns user_wants: wants fits_pet_type: fits - + neopets_page_import_tasks: create: success: Page %{index} saved! @@ -418,31 +395,27 @@ en: updated_hangers: one: We updated the quantity for 1 of your items. other: We updated the quantity for %{count} of your items. - no_changes: - We already had this data recorded to your account, so we didn't make any changes. + no_changes: We already had this data recorded to your account, so we didn't make any changes. no_data: We didn't see any wearables, so we didn't make any changes. unknown_items: - one: - "We also found an item we didn't recognize: %{item_names}. Please + one: "We also found an item we didn't recognize: %{item_names}. Please model it for us and we'll update our database instantly. Thanks!" - other: - "We also found %{count} items we didn't recognize: %{item_names}. + other: "We also found %{count} items we didn't recognize: %{item_names}. Please model them for us and we'll update our database instantly. Thanks!" - next_page: - Now the frame should contain page %{next_index}. + next_page: Now the frame should contain page %{next_index}. Paste that source code over, too. done: That was the last page of your Neopets %{name}. parse_error: We had trouble reading your source code. Is it a valid HTML document? Make sure you pasted the computery-looking result of clicking View Frame Source, and not the pretty-looking page itself. - + names: closet: closet safety_deposit: safety deposit gallery: gallery - + new: title: Import from %{name}, Page %{index} your_items_link: Back to Your Items @@ -457,8 +430,7 @@ en: works. check_frame: header: - main_html: - Check the framed Neopets.com window on the left, + main_html: Check the framed Neopets.com window on the left, pointing to %{page_link}. page_link_content: page %{index} of your %{name} check_login: @@ -476,8 +448,7 @@ en: It's never a good idea to log in inside of a frame, unless you're a web programmer pro who can check that the frame does, in fact, point to Neopets.com. To be safe, %{login_link}. - login_link_content: - pull up another window, check the URL, and log in safely + login_link_content: pull up another window, check the URL, and log in safely check_content: summary: Confirm that the page is, in fact, your %{name}. details: @@ -493,16 +464,14 @@ en: In Firefox, right-click the frame, choose This Frame, then View Frame Source. - other: - In other browsers, right-click and look for something similar. + other: In other browsers, right-click and look for something similar. troubleshooting: main_html: If you're still having trouble, try %{page_link}, right-clicking, and choosing View Source. page_link_content: opening the page in a new window copy_source: - header: - Highlight the entire source code, + header: Highlight the entire source code, and copy-paste it into the box on the right. shortcuts: "Some nifty shortcuts: Ctrl-A to select all the text, Ctrl-C to @@ -515,19 +484,16 @@ en: to Impress items list. I promise it's all safe, but, if you're concerned, find a programmer buddy and check out the source code to be sure. - + neopets_users: create: success: - zero: - Okay. We loaded %{user_name}'s pets, but already had these items + zero: Okay. We loaded %{user_name}'s pets, but already had these items recorded to your account. - one: - Success! We loaded %{user_name}'s pets, and added 1 item. - other: - Success! We loaded %{user_name}'s pets, and added %{count} items. + one: Success! We loaded %{user_name}'s pets, and added 1 item. + other: Success! We loaded %{user_name}'s pets, and added %{count} items. not_found: Could not find user %{user_name}. Is it spelled correctly? - + new: title: Import from pets your_items_link: Back to Your Items @@ -536,11 +502,11 @@ en: from all your pets. It's easy! username_label: Neopets Username submit: Import all pets - + outfits: destroy: success: Outfit "%{outfit_name}" successfully deleted. - + edit: item: controls: @@ -551,8 +517,7 @@ en: add: Closet remove: Uncloset pet_type: - not_found: - We haven't seen that combination before. Have you? + not_found: We haven't seen that combination before. Have you? Submit the pet's name if you have! form: submit: Go @@ -573,8 +538,7 @@ en: submit: Save cancel: Cancel preview: - requirements: - Flash and Javascript (but not Java!) are required to preview outfits. + requirements: Flash and Javascript (but not Java!) are required to preview outfits. big_picture: Big Picture download: Download swf_links: SWF Links @@ -608,11 +572,11 @@ en: We know how hard it can be to keep track of your ideas, especially if you end up having a lot of them. **But Dress to Impress makes it easy.** - + Once you have an idea for an outfit, you can **build it, save it, and view it again later**, either to update your design or finally make your dream a reality. - + **Thousands of users have already saved hundreds of thousands of outfits. Will you be next?** sign_in: Log in to save this outfit @@ -670,11 +634,9 @@ en: login: Log in to use these filters. userbar: session_message: - signed_in: - You will be logged out, then brought back to this exact outfit. - not_signed_in: - You will be logged in, then brought back to this exact outfit. - + signed_in: You will be logged out, then brought back to this exact outfit. + not_signed_in: You will be logged in, then brought back to this exact outfit. + index: title: Your Outfits intro: @@ -692,12 +654,11 @@ en: click "Save Outfit" in the top right corner. It'll be great, I promise. start_link_content: Start at the home page - + new: tagline: Neopets wearables made easy! preview: - pet_type_not_found: - We haven't seen a %{color_name} %{species_name}. Have you? + pet_type_not_found: We haven't seen a %{color_name} %{species_name}. Have you? pet_not_found: Pet not found. submit: primary: Plan my outfit! @@ -718,8 +679,7 @@ en: submit: Go your_items: tagline: Track and trade! - description: - Make lists of the items you own and want, + description: Make lists of the items you own and want, and share them with the world. user_search: placeholder: find a user… @@ -740,8 +700,7 @@ en: submit: submit latest_contribution: header: Contributions - description_html: - "%{user_link} showed us %{contributed_description}. + description_html: "%{user_link} showed us %{contributed_description}. Thanks, %{user_link}!" blog: link: OpenNeo Blog @@ -754,9 +713,9 @@ en: other: Or maybe the %{color} %{species_list}? call_to_action: If so, please model it above! Thanks! species_list: - words_connector: ', ' - two_words_connector: ' or ' - last_word_connector: ', or ' + words_connector: ", " + two_words_connector: " or " + last_word_connector: ", or " modeled: header: These items have already been modeled—thanks for your help! body_title: You just finished modeling this—thanks so much! @@ -770,22 +729,20 @@ en: error: Couldn't load. Try again? title: Submit %{pet} as a model, especially if they're wearing the %{item}! pet_query: - notice_html: - Thanks for showing us %{pet_name}. + notice_html: Thanks for showing us %{pet_name}. Keep up the good work! - + outfit: edit: edit delete: delete - delete_confirmation: - Are you sure you want to delete the outfit %{outfit_name}? - + delete_confirmation: Are you sure you want to delete the outfit %{outfit_name}? + show: default_outfit_name: Shared outfit edit: Edit clone: Edit a copy creation_summary_html: Created by %{user_link}, %{created_at_ago} ago - + pet_states: description: main: "%{mood} %{gender}" @@ -800,7 +757,7 @@ en: unconverted: Unconverted unlabeled: Unlabeled default_artist_name: the OpenNeo team - + pet_types: human_name: "%{color_human_name} %{species_human_name}" @@ -831,7 +788,7 @@ en: waiting: Waiting… loading: Loading… submission_success: "%{points} points" - + load: not_found: We couldn't find a pet by that name. Is it spelled correctly? asset_download_error: @@ -840,8 +797,8 @@ en: pet_download_error: We couldn't connect to Neopets to look up the pet. Maybe they're down. Please try again later! - neopia_error: "We couldn't load that pet: \"%{message}\". Try again later?" - + neopia_error: 'We couldn''t load that pet: "%{message}". Try again later?' + swf_assets: links: title: Links to SWFs @@ -849,13 +806,13 @@ en: users: index: not_found: We don't have a user named %{name}. Is it spelled correctly? - + top_contributors: title: Top Contributors rank: Rank user: User points: Points - + update: success: Settings successfully saved. invalid: "Could not save settings: %{errors}" diff --git a/config/locales/es.yml b/config/locales/es.yml index b482af41..f9d3d104 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -33,17 +33,6 @@ es: items: title_tagline: Base de datos de Neopets personalizados y ropa Apta Para Usar search: Buscar - broken_image_reports: - create: - success: ¡Muchas gracias! Esta imagen será transformada pronto. Si ves la misma imagen tras la transformación, por favor notifícanos con un reporte de error. - already_reported: Está imagen ya está siendo transformada. Pronto se pondrá bien, no te preocupes. - new: - title: Reportar el error de una imagen - explanation_html: ¡Gracias por ayudarnos a encontrar errores en las imágenes! Algunas veces las transformaciones no funcionan correctamente y otras muchas el error se puede arreglar transformando la imagen de nuevo. Si vuelves a transformar la imagen y no se arregla, por favor envíanos un reporte de error a %{contact_link}. ¡Muchas gracias! - call_to_action: ¿Cuál de estas imágenes tiene algún tipo de error? - submit: Reportar como dañada - converted_at_html: Transformada hace %{converted_at_ago} - reported_at_html: Reportada hace %{reported_at_ago} closet_hangers: closet_hanger: submit: Guardar @@ -92,7 +81,7 @@ es: add_item_html: Añadir %{item_name} add_to_list_html: Añadir a %{list_name} add_to_group_html: Añadir a %{group_name}, no listado - already_in_collection_html: 'Ya tienes este objeto en %{collection_name} ' + already_in_collection_html: "Ya tienes este objeto en %{collection_name} " petpage: title: Exportar para petpage your_items_link: Volver a Tus Objetos @@ -315,7 +304,7 @@ es: submit: Importar objetos help: welcome: ¡Bienvenido al importador de tu %{name} ! - intro: 'Vamos a hacer de la forma más fácil posible el poder importar los datos de tu %{name} en Neopets.com hacia tu lista de objetos en Dress to Impress. Así es cómo funciona:' + intro: "Vamos a hacer de la forma más fácil posible el poder importar los datos de tu %{name} en Neopets.com hacia tu lista de objetos en Dress to Impress. Así es cómo funciona:" check_frame: header: main_html: Mira arriba a la izquierda la ventanita que muestra la página de Neopets.com, verás que está en la %{page_link}. @@ -543,9 +532,9 @@ es: item_owned: Tú tienes este objeto bulk_pets: header: Hacer que desfilen varios pets a la vez - explanation: '¿Tienes muchos pets para que desfilen? + explanation: "¿Tienes muchos pets para que desfilen? - Escribe o pega una lista de pets, recuerda añadir un nombre por línea :P ¡Muchas gracias por tu ayuda!' + Escribe o pega una lista de pets, recuerda añadir un nombre por línea :P ¡Muchas gracias por tu ayuda!" submit: Cargar pet add: Añadir clear: Limpiar diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 2249d8fc..3416f8a5 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -33,17 +33,6 @@ pt: items: title_tagline: Banco de dados de roupas e artigos aplicáveis de Neopets search: Pesquisa - broken_image_reports: - create: - success: Obrigado! Esta imagem será reconvertida em breve. Se parecer o mesmo após a conversão, por favor, considere o envio de um relatório de bug. - already_reported: Esta imagem já na nossa lista de reconversão. Nós vamos reconverte-la em breve, não se preocupe. - new: - title: Reportar imagem quebrada - explanation_html: Obrigado por nos ajudar a encontrar imagens quebradas! Às vezes, os conversores não fazem as coisas muito bem e, às vezes, isso pode ser corrigido apenas tentando a conversão novamente. Se a reconversão não resolver o problema, considere enviar-nos um relatório de bug em %{contact_link}. Obrigado! - call_to_action: 'Algumas dessas imagens parecem quebradas? Nós vamos coloca-la na nossa linha de reconversão. ' - submit: Reportar imagem - converted_at_html: Convertido %{converted_at_ago} atrás - reported_at_html: Reportado %{reported_at_ago} atrás closet_hangers: closet_hanger: submit: Salvar @@ -143,7 +132,7 @@ pt: visibility: label: Quem pode ver essa lista? description: - hint: 'Por que esses itens estão nessa lista? Quais são seus termos para troca? Ou você pode deixar isso em branco ' + hint: "Por que esses itens estão nessa lista? Quais são seus termos para troca? Ou você pode deixar isso em branco " markup_hint_html: We _support_ **Markdown** and some HTML. submit: Salvar Lista groups: @@ -355,9 +344,9 @@ pt: other: Sucesso! Nós carregamos o pet de %{user_name} e adicionamos %{count} itens. not_found: Não encontramos o usuário %{user_name}. Está escrito corretamente? new: - title: 'Importar dos pets ' + title: "Importar dos pets " your_items_link: Voltar para "Seus Items" - explanation: 'Digite seu nome de usuário de Neopets abaixo e nós importaremos todos os aplicáveis de todos seus pets. É fácil! ' + explanation: "Digite seu nome de usuário de Neopets abaixo e nós importaremos todos os aplicáveis de todos seus pets. É fácil! " username_label: Nome de Usuário de Neopets submit: Importar todos os Pets outfits: diff --git a/config/routes.rb b/config/routes.rb index 711ef9ac..f8a7ddce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -23,7 +23,6 @@ OpenneoImpressItems::Application.routes.draw do get '/roulette' => 'roulettes#new', :as => :roulette - resources :broken_image_reports, :only => [:new, :create] resources :contributions, :only => [:index] resources :items, :only => [:index, :show] do collection do diff --git a/vendor/cache/resque-retry-0.1.0.gem b/vendor/cache/resque-retry-0.1.0.gem deleted file mode 100644 index 0f0aa49b..00000000 Binary files a/vendor/cache/resque-retry-0.1.0.gem and /dev/null differ diff --git a/vendor/cache/swf_converter-0.0.3.gem b/vendor/cache/swf_converter-0.0.3.gem deleted file mode 100644 index 50c9a4c7..00000000 Binary files a/vendor/cache/swf_converter-0.0.3.gem and /dev/null differ