573e8a6459
use I18n.with_locale wherever possible, since it catches errors properly
...
In particular, pet#load was handling locale-switching itself, but wasn't
switching back to original locale on error. We could've used a rescue
block, but, when I18n.with_locale is so cool, may as well use it fully.
2013-01-25 15:09:56 -06:00
85d52c23c3
more helpful ownership-not-found error message
2013-01-25 11:16:47 -06:00
4e0ce6c20b
bugfix: zone-not-found raises error again
2013-01-25 11:15:54 -06:00
c5fbf74a7d
update query examples: zone -> occupies, add restricts
2013-01-25 11:14:31 -06:00
d3b449a8f9
Merge branch 'globalized_search' into i18n
...
Conflicts:
Gemfile
app/controllers/application_controller.rb
app/controllers/items_controller.rb
app/controllers/outfits_controller.rb
app/helpers/application_helper.rb
app/views/items/show.html.haml
config/locales/en-MEEP.yml
config/locales/en.yml
public/stylesheets/compiled/screen.css
2013-01-25 11:09:07 -06:00
e6d9e5ee75
stop removing "item" from zone plain labels: background vs. backgrounditem
2013-01-25 10:47:47 -06:00
d0dffd6cff
fix ClosetHanger.set_quantity to not call destroy on a new hanger; it confuses flex
2013-01-25 10:44:15 -06:00
7f18fe12c1
user:owns, user:wants queries
2013-01-25 10:35:35 -06:00
dd30fbe0d7
move from with_translations to includes(:translations), since we dont usually care about requiring
2013-01-24 18:26:00 -06:00
b2822d901b
fix n+1 query for translations on items#index
2013-01-24 18:26:00 -06:00
26ac3782ec
move zones to database
2013-01-24 18:26:00 -06:00
ce4e2fd53c
move species to database
2013-01-24 18:25:59 -06:00
965465ca51
move species to database
2013-01-24 18:25:59 -06:00
94ecc6f02d
remove old item search interface
2013-01-24 18:24:35 -06:00
332a7e67d8
update ItemsController to show new search errors properly
2013-01-24 18:24:35 -06:00
cded361f73
update item search to original name-matching behavior
...
We originally had a regression on name-matching, where, among
other issues, `straw hat` returned items containing both "straw"
and "hat", which isn't really helpful behavior since we're sorting
alphabetically. Now, `straw hat` behaves as expected.
Additionally, "phrases like these" behave as expected, too.
2013-01-24 18:24:35 -06:00
04f29c8611
allow non-item zones in queries (mainly for restricts filters)
2013-01-24 18:24:35 -06:00
66e0ba28d7
species/zone conditions now render properly, instead of raising parse error from elastic
2013-01-24 18:24:35 -06:00
6e09b8bc10
globalized search first draft
...
Confirmed features:
* Output (retrieval, sorting, etc.)
* Name (positive and negative, but new behavior)
* Flags (positive and negative)
Planned features:
* users:owns, user:wants
Known issues:
* Sets are broken
* Don't render properly
* Shouldn't actually be done as joined sets, anyway, since
we actually want (set1_zone1 OR set1_zone2) AND
(set2_zone1 OR set2_zone2), which will require breaking
it into multiple terms queries.
* Name has regressed: ignores phrases, doesn't require *all*
words. While we're breaking sets into multiple queries,
maybe we'll do something similar for name. In fact, we
really kinda have to if we're gonna keep sorting by name,
since "straw hat" returns all hats. Eww.
2013-01-24 18:24:35 -06:00
c9ae7155b1
locale metadata, including hidden locales for item loading and selection
2013-01-24 18:24:34 -06:00
ef2423e87f
globalize3 for items
2013-01-24 18:24:34 -06:00
1439e4a74c
canonical paths are always in english
2013-01-24 18:24:34 -06:00
29ed401238
load pet by locale, prepare needed translations
2013-01-24 18:24:34 -06:00
9c8f7f498f
basic translation infrastructure for items - search is still english-only, and probably will have to be replaced with a legit search engine
2013-01-24 18:24:34 -06:00
d79c225c1e
apply globalize3 to items
2013-01-24 18:24:34 -06:00
93cdb40dc5
enable fallbacks
2013-01-24 18:24:34 -06:00
b22188fa4a
locale cookie should be long-term, not a session cookie
2013-01-24 18:24:33 -06:00
0f49d3ed02
simple locale dropdown in layouts#application
2013-01-24 18:24:33 -06:00
d96c54f3cc
infer locale from params, then cookies, then Accept-Language header
2013-01-24 18:23:21 -06:00
3b1ffe71a9
i18n for will_paginate, including dynamically in outfits#edit
2013-01-24 18:23:21 -06:00
34e99bba72
i18n for outfits/new.js
2013-01-24 18:23:21 -06:00
8b15d31639
i18n for pet_query.js
2013-01-24 18:23:21 -06:00
3b3c57f31a
fix dumb transpositional errors in closet_hangers.create.success.owned.unlisted
2013-01-24 18:23:21 -06:00
062f485598
i18n for pets#load flashes
2013-01-24 18:23:21 -06:00
e833179155
refactor outfits.new for hierarchy
2013-01-24 18:23:21 -06:00
e54e4c606c
oops, re-refactor closet_hangers.index.autocomplete, since markdown wraps it in a paragraph
2013-01-24 18:23:21 -06:00
82479315f0
refactor neopets_pages.new for twl
2013-01-24 18:23:21 -06:00
70ff4974a3
refactor items.show for hierarchy and twl
2013-01-24 18:23:21 -06:00
0cbdc30a15
refactor items.index for hierarchy and twl
2013-01-24 18:23:21 -06:00
4bf73b4285
refactor closet_lists.form hierarchy
2013-01-24 18:23:20 -06:00
1f1bfb3140
refactor closet_hangers.petpage.instructions to use twl
2013-01-24 18:23:20 -06:00
5935ed055d
refactor tmd helper, move closet_hangers#index autocomplete to markdown
2013-01-24 18:23:20 -06:00
7f2070e78e
refactor userbar contributions to use twl
2013-01-24 18:23:20 -06:00
3d8266951f
i18n for outfits/edit.js item partials: no-data-yet and icons
2013-01-24 18:23:20 -06:00
629e5c68a9
i18n for outfits/edit.js userbar message and outfit save errors
2013-01-24 18:23:20 -06:00
ec6c7b550d
i18n for outfits/edit.js sharing urls
2013-01-24 18:23:20 -06:00
2b1cb2fe7f
i18n for outfits#edit base template - dynamic content in outfits/edit.js still needs examined
2013-01-24 18:23:20 -06:00
b346bcc6d9
i18n for outfits#index - plus the translate_with_links helper, which can be used for refactoring other stuff
2013-01-24 18:23:20 -06:00
029373addd
i18n for outfits#destroy flashes
2013-01-24 18:23:20 -06:00
8c9dda37d5
i18n for closet_hangers#index search bar autocomplete
2013-01-24 18:23:20 -06:00
