Skip to content

Commit

Permalink
Merge pull request #9865 from robojumper/harrowed
Browse files Browse the repository at this point in the history
  • Loading branch information
bhollis authored Sep 10, 2023
2 parents 97f31f6 + 939ba6e commit c01575a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions config/i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@
"HasNotes": "Show items that have notes applied.",
"HasShader": "Shows items that have a shader applied.",
"HasOrnament": "Shows items that have an ornament applied.",
"Harrowed": "\\(Harrowed\\)",
"InLoadout": "is:inloadout shows items that are included in any loadout. Searching with inloadout: shows items that are included in loadouts with matching titles. When used with a hashtag, inloadout: shows items whose loadouts have the hashtag in the title or notes.",
"InInGameLoadout": "is:iningameloadout shows items that are included in any in-game loadout.",
"Infusable": "Shows items that can be infused.",
Expand Down
4 changes: 2 additions & 2 deletions src/app/compare/compare-buttons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ const getRpm = (i: DimItem) => {
};

/**
* Strips the (Timelost) or (Adept) suffixes for the user's language
* Strips the (Adept) (or (Timelost) or (Harrowed)) suffixes for the user's language
* in order to include adept items in non-adept comparisons and vice versa.
*/
export const stripAdept = (name: string) =>
name
.replace(new RegExp(t('Filter.Adept'), 'gi'), '')
.trim()
.replace(new RegExp(t('Filter.Timelost'), 'gi'), '')
.replace(new RegExp(t('Filter.Harrowed'), 'gi'), '')
.trim();

export function compareNameQuery(item: DimItem) {
Expand Down
1 change: 1 addition & 0 deletions src/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@
"Focusable": "Shows items that can be focused at a vendor",
"Foundry": "Shows items by which foundry created them.",
"Glimmer": "Shows items that are consumables that are related to gaining glimmer.",
"Harrowed": "\\(Harrowed\\)",
"HasNotes": "Show items that have notes applied.",
"HasOrnament": "Shows items that have an ornament applied.",
"HasShader": "Shows items that have a shader applied.",
Expand Down

0 comments on commit c01575a

Please sign in to comment.