Skip to content

Commit

Permalink
Merge pull request #356 from WatWowMap/add-more-translations
Browse files Browse the repository at this point in the history 
Support Popup Translations
  • Loading branch information
@TurtIeSocks
TurtIeSocks authored Apr 15, 2021
2 parents f57e26a + dc376c4 commit 701fb47
Show file tree
Hide file tree
Showing 5 changed files with 329 additions and 175 deletions.
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

92 changes: 46 additions & 46 deletions src/views/index.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,22 +293,22 @@
<div class="dropdown-menu">
<a id="disable-all-pokemon-filter" class="dropdown-item" href="#">{{filter_disable_all}}</a>
<div class="dropdown-header">{{filter_option_rarity}}</div>
<a id="disable-common-pokemon-filter" class="dropdown-item" href="#">Common</a>
<a id="disable-uncommon-pokemon-filter" class="dropdown-item" href="#">Uncommon</a>
<a id="disable-rare-pokemon-filter" class="dropdown-item" href="#">Rare</a>
<a id="disable-ultra-pokemon-filter" class="dropdown-item" href="#">Ultra Rare</a>
<a id="disable-regional-pokemon-filter" class="dropdown-item" href="#">Regional</a>
<a id="disable-event-pokemon-filter" class="dropdown-item" href="#">Event</a>
<a id="disable-common-pokemon-filter" class="dropdown-item" href="#">{{common}}</a>
<a id="disable-uncommon-pokemon-filter" class="dropdown-item" href="#">{{uncommon}}</a>
<a id="disable-rare-pokemon-filter" class="dropdown-item" href="#">{{rare}}</a>
<a id="disable-ultra-pokemon-filter" class="dropdown-item" href="#">{{ultra_rare}}</a>
<a id="disable-regional-pokemon-filter" class="dropdown-item" href="#">{{regional}}</a>
<a id="disable-event-pokemon-filter" class="dropdown-item" href="#">{{event}}</a>
<div class="dropdown-header">{{filter_option_generation}}</div>
<a id="disable-kanto-pokemon-filter" class="dropdown-item" href="#">Kanto</a>
<a id="disable-johto-pokemon-filter" class="dropdown-item" href="#">Johto</a>
<a id="disable-hoenn-pokemon-filter" class="dropdown-item" href="#">Hoenn</a>
<a id="disable-sinnoh-pokemon-filter" class="dropdown-item" href="#">Sinnoh</a>
<a id="disable-unova-pokemon-filter" class="dropdown-item" href="#">Unova</a>
<a id="disable-kalos-pokemon-filter" class="dropdown-item" href="#">Kalos</a>
<a id="disable-kanto-pokemon-filter" class="dropdown-item" href="#">{{kanto}}</a>
<a id="disable-johto-pokemon-filter" class="dropdown-item" href="#">{{johto}}</a>
<a id="disable-hoenn-pokemon-filter" class="dropdown-item" href="#">{{hoenn}}</a>
<a id="disable-sinnoh-pokemon-filter" class="dropdown-item" href="#">{{sinnoh}}</a>
<a id="disable-unova-pokemon-filter" class="dropdown-item" href="#">{{unova}}</a>
<a id="disable-kalos-pokemon-filter" class="dropdown-item" href="#">{{kalos}}</a>
<div class="dropdown-header">{{filter_option_form}}</div>
<a id="disable-alolan-pokemon-filter" class="dropdown-item" href="#">Alolan</a>
<a id="disable-galarian-pokemon-filter" class="dropdown-item" href="#">Galarian</a>
<a id="disable-alolan-pokemon-filter" class="dropdown-item" href="#">{{alolan}}</a>
<a id="disable-galarian-pokemon-filter" class="dropdown-item" href="#">{{galarian}}</a>
</div>
</div>
&nbsp;
Expand All @@ -319,22 +319,22 @@
<div class="dropdown-menu">
<a id="reset-pokemon-filter" class="dropdown-item" href="#">{{filter_reset}}</a>
<div class="dropdown-header">{{filter_option_rarity}}</div>
<a id="reset-common-pokemon-filter" class="dropdown-item" href="#">Common</a>
<a id="reset-uncommon-pokemon-filter" class="dropdown-item" href="#">Uncommon</a>
<a id="reset-rare-pokemon-filter" class="dropdown-item" href="#">Rare</a>
<a id="reset-ultra-pokemon-filter" class="dropdown-item" href="#">Ultra Rare</a>
<a id="reset-regional-pokemon-filter" class="dropdown-item" href="#">Regional</a>
<a id="reset-event-pokemon-filter" class="dropdown-item" href="#">Event</a>
<a id="reset-common-pokemon-filter" class="dropdown-item" href="#">{{common}}</a>
<a id="reset-uncommon-pokemon-filter" class="dropdown-item" href="#">{{uncommon}}</a>
<a id="reset-rare-pokemon-filter" class="dropdown-item" href="#">{{rare}}</a>
<a id="reset-ultra-pokemon-filter" class="dropdown-item" href="#">{{ultra_rare}}</a>
<a id="reset-regional-pokemon-filter" class="dropdown-item" href="#">{{regional}}</a>
<a id="reset-event-pokemon-filter" class="dropdown-item" href="#">{{event}}</a>
<div class="dropdown-header">{{filter_option_generation}}</div>
<a id="reset-kanto-pokemon-filter" class="dropdown-item" href="#">Kanto</a>
<a id="reset-johto-pokemon-filter" class="dropdown-item" href="#">Johto</a>
<a id="reset-hoenn-pokemon-filter" class="dropdown-item" href="#">Hoenn</a>
<a id="reset-sinnoh-pokemon-filter" class="dropdown-item" href="#">Sinnoh</a>
<a id="reset-unova-pokemon-filter" class="dropdown-item" href="#">Unova</a>
<a id="reset-kalos-pokemon-filter" class="dropdown-item" href="#">Kalos</a>
<a id="reset-kanto-pokemon-filter" class="dropdown-item" href="#">{{kanto}}</a>
<a id="reset-johto-pokemon-filter" class="dropdown-item" href="#">{{johto}}</a>
<a id="reset-hoenn-pokemon-filter" class="dropdown-item" href="#">{{hoenn}}</a>
<a id="reset-sinnoh-pokemon-filter" class="dropdown-item" href="#">{{sinnoh}}</a>
<a id="reset-unova-pokemon-filter" class="dropdown-item" href="#">{{unova}}</a>
<a id="reset-kalos-pokemon-filter" class="dropdown-item" href="#">{{kalos}}</a>
<div class="dropdown-header">{{filter_option_form}}</div>
<a id="reset-alolan-pokemon-filter" class="dropdown-item" href="#">Alolan</a>
<a id="reset-galarian-pokemon-filter" class="dropdown-item" href="#">Galarian</a>
<a id="reset-alolan-pokemon-filter" class="dropdown-item" href="#">{{alolan}}</a>
<a id="reset-galarian-pokemon-filter" class="dropdown-item" href="#">{{galarian}}</a>
</div>
<button id="quick-start-pokemon-filter" type="button" class="btn btn-sm btn-success">{{quick_start_pokemon_btn}}</button>
</div>
Expand All @@ -357,38 +357,38 @@
</button>
</div>
<div class="modal-body">
<div class="help-title"><h4>Ways To Filter</h4></div><br>
<div class="help-title"><h4>{{ways_to_filter}}</h4></div><br>

<div class="help-title"><b>General Basics</b></div>
<div class="help-title"><b>{{general_basics}}</b></div>
<div class="help-description">
<p>
IV Range: <kbd>90-100</kbd> - 90-100% IV Pokemon<br>
Level Range: <kbd>L30-35</kbd> - Level 30 to 35 Pokemon<br>
Stats: <kbd>A0-1 & D14 & S15</kbd> - Pokemon with 0-1 Attack, 14 Defense & 15 Stamina<br>
CP: <kbd>CP2000-3000</kbd> - All Pokemon with CP of 2000-3000<br>
NOT: <kbd>!0-100</kbd> - All Pokemon that do not have their IVs scanned<br>
PVP: <kbd>GL1-3 | UL1-3</kbd> - Pokemon that are rank 1-3 for either Great League or Ultra League<br><br>
{{iv_range}}: <kbd>90-100</kbd> - {{iv_result}}<br>
{{level_range}}: <kbd>L30-35</kbd> - {{level_result}}<br>
{{stats}}: <kbd>A0-1 & D14 & S15</kbd> - {{stats_result}}<br>
{{popup_cp}}: <kbd>CP2000-3000</kbd> - {{cp_result}}<br>
{{not}}: <kbd>!0-100</kbd> - {{not_result}}<br>
{{pvp}}: <kbd>GL1-3 | UL1-3</kbd> - {{pvp_result}}<br><br>
</p>
</div>

<div class="help-title"><b>Stringing Conditions Together</b></div>
<div class="help-title"><b>{{stringing_conditions_together}}</b></div>
<div class="help-description">
<p>
<b><kbd>|</kbd> or <kbd>,</kbd></b> - OR operator, for setting separate conditions<br>
Example: <kbd>95-100 | L35 | CP2500-4000</kbd><br>
Returns all Pokemon that are either 95-100% IV, L35, or have a CP of 2500-4000<br><br>
<b><kbd>|</kbd> {{or}} <kbd>,</kbd></b> - {{or_explanation}}<br>
{{example}}: <kbd>95-100 | L35 | CP2500-4000</kbd><br>
{{or_result}}<br><br>

<b><kbd>&</kbd></b> - AND operator, for chaining conditions together<br>
Example: <kbd>80-100 & L25-30 & (A15 & D10 & S10)</kbd><br>
All Pokemon with IVs between 80-100, are L25-30, and have stats of 15/10/10<br><br>
<b><kbd>&</kbd></b> - {{and_explanation}}<br>
{{example}}: <kbd>80-100 & L25-30 & (A15 & D10 & S10)</kbd><br>
{{and_result}}<br><br>
</p>
</div>

<div class="help-title"><b>Advanced</b></div>
<div class="help-title"><b>{{advanced}}</b></div>
<div class="help-description">
<p>
Example: <kbd>(A0-1 & D15 & S15 & (CP1400-1500 | CP2400-2500)) | L34-35,90-100 | GL1-3,UL1-3</kbd><br>
Returns all Pokemon that have either CP1400-1500 OR CP2400-2500 AND have 0-1 Attack, 15 Defense, 15 Stamina, OR level 34-35 OR 90-100% IVs OR PVP Great or Ultra league rank betwen 1-3.
{{example}}: <kbd>(A0-1 & D15 & S15 & (CP1400-1500 | CP2400-2500)) | L34-35,90-100 | GL1-3,UL1-3</kbd><br>
{{advanced_result}}
</p>
</div>
</div>
Expand Down
30 changes: 15 additions & 15 deletions static/data/weathertypes.json
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
{
"0": {
"types": [],
"name": "None"
"name": "none"
},
"1": {
"types": ["Fire","Grass","Ground"],
"name": "Clear"
"types": ["fire","grass","ground"],
"name": "clear"
},
"2": {
"types": ["Water","Electric","Bug"],
"name": "Rain"
"types": ["water","electric","bug"],
"name": "rain"
},
"3": {
"types": ["Normal","Rock"],
"name": "Partly Cloudy"
"types": ["normal","rock"],
"name": "partly_cloudy"
},
"4": {
"types": ["Fairy","Fighting","Poison"],
"name": "Cloudy"
"types": ["fairy","fighting","poison"],
"name": "cloudy"
},
"5": {
"types": ["Dragon","Flying","Psychic"],
"name": "Windy"
"types": ["dragon","flying","psychic"],
"name": "windy"
},
"6": {
"types": ["Ice","Steel"],
"name": "Snow"
"types": ["ice","steel"],
"name": "snow"
},
"7" : {
"types": ["Dark","Ghost"],
"name": "Fog"
"types": ["dark","ghost"],
"name": "fog"
}
}
Loading

0 comments on commit 701fb47

Please sign in to comment.