CS Miscstats: Fix enemy remaining option displaying the message to the wrong team #611
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
OciXCrom
reviewed
Oct 1, 2018
plugins/lang/miscstats.txt
Outdated
| @@ -41,7 +41,8 @@ CT = CT | |||
| CTS = CTS | |||
| TERRORIST = TERRORIST | |||
| TERRORISTS = TERRORISTS | |||
| REMAINING = %d %s Remaining... | |||
| REMAINING_ENEMY = Last enemy remaining... | |||
There was a problem hiding this comment.
This sounds weird. I would change it to "Only one enemy remaining".
There was a problem hiding this comment.
@rsKliPPy said it was fine, but I guess we can't trust him! 🙊
My English is horrible, so I expect people giving me the right default phrase.
There was a problem hiding this comment.
Never trust anyone!
Maybe it would be better if it's just "1 enemy remaining" or "%d enemy remaining" so it remains the same with its plural version "%d enemies remaining".
There was a problem hiding this comment.
I wanted to avoid `%d' because it will be always 1, and it would be dumb to keep it. Also, it should give more freedom to translate. Like you could say either "1 enemy remaining", or someone would prefer "One enemy remaining".
|
Here are some more translations: [mk]
REMAINING_ENEMY = Preostanuva ushte samo eden protivnik...
REMAINING_ENEMIES = %d preostanati protivnici...
[bg]
REMAINING_ENEMY = Ostava oshte samo edin vrag...
REMAINING_ENEMIES = %d ostanali vragove... |
plugins/cstrike/miscstats.sma
Outdated
| @@ -543,48 +537,26 @@ public client_death(killer, victim, wpnindex, hitplace, TK) | |||
| } | |||
| } | |||
|
|
|||
| new team = get_user_team(victim) | |||
| if (EnemyRemaining && is_user_connected(victim)) | |||
| new team = get_user_team(victim); | |||
There was a problem hiding this comment.
It's actually weird this native was not used from the start.
|
I'd consider removal of core language keys a breaking change. |
Arkshine
force-pushed
the
fix/enemy-remaining
branch
2 times, most recently
from
c65435b
to
be84725
Compare
Arkshine
force-pushed
the
fix/enemy-remaining
branch
from
be84725
to
16302fb
Compare
|
Original language key is back. |
|
I assume this should be in 1.9 as well. |
Arkshine
added a commit
that referenced
this pull request
Oct 11, 2018
Arkshine
pushed a commit
that referenced
this pull request
Oct 12, 2018
* Update miscstats.txt #618 * Update statsx.txt #618 * Update and rename mapchooser.txt to admincmd * Rename admincmd to mapchooser.txt * Update admincmd.txt * Update common.txt * Update multilingual.txt * Update multilingual.txt * Update scrollmsg.txt * Update statscfg.txt * Update adminchat.txt * Update adminhelp.txt * Update adminvote.txt * Update cmdmenu.txt * Update common.txt * Update mapchooser.txt * Update mapsmenu.txt * Update menufront.txt * Update miscstats.txt * Update multilingual.txt * Update nextmap.txt * Update pausecfg.txt * Update plmenu.txt plmenu.txt adresses only the behaviour in the "Menü", not the text in the chat! * Update restmenu.txt * Update scrollmsg.txt * Update stats_dod.txt * Update statscfg.txt * Update statsx.txt * Update telemenu.txt * Update timeleft.txt * Update admincmd.txt * Update plmenu.txt * Update adminchat.txt * Update admincmd.txt * Update mapsmenu.txt * Update miscstats.txt added changes due to PR #611 ! * Update miscstats.txt * Update pausecfg.txt * Update admincmd.txt * Update statscfg.txt
Arkshine
pushed a commit
that referenced
this pull request
Oct 13, 2018
* Update miscstats.txt #618 * Update statsx.txt #618 * Update and rename mapchooser.txt to admincmd * Rename admincmd to mapchooser.txt * Update admincmd.txt * Update common.txt * Update multilingual.txt * Update multilingual.txt * Update scrollmsg.txt * Update statscfg.txt * Update adminchat.txt * Update adminhelp.txt * Update adminvote.txt * Update cmdmenu.txt * Update common.txt * Update mapchooser.txt * Update mapsmenu.txt * Update menufront.txt * Update miscstats.txt * Update multilingual.txt * Update nextmap.txt * Update pausecfg.txt * Update plmenu.txt plmenu.txt adresses only the behaviour in the "Menü", not the text in the chat! * Update restmenu.txt * Update scrollmsg.txt * Update stats_dod.txt * Update statscfg.txt * Update statsx.txt * Update telemenu.txt * Update timeleft.txt * Update admincmd.txt * Update plmenu.txt * Update adminchat.txt * Update admincmd.txt * Update mapsmenu.txt * Update miscstats.txt added changes due to PR #611 ! * Update miscstats.txt * Update pausecfg.txt * Update admincmd.txt * Update statscfg.txt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #560.
Regression from 9e4fe0d#diff-3afb3f242934c594b97f6626a9655704L313.
The second
get_playersoverwrites the correct list.victim_alivecheck is dropped. It's not needed anymore. It was using the wrong list, the message is not going to be shown to the victim.REMAININGtranslation. It was translatingTERRORIST/CTwith/out anSseparately, that's not really convenient for the user and complexifies the code for nothing. Now, the team name is replaced by "enemy", and two keys have been added:REAMAING_ENEMYandREMAINING_ENEMIES. It will be easier for to translate.