Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small Arms - Add stringtable #7823

Merged
merged 5 commits into from
Aug 9, 2020
Merged

Small Arms - Add stringtable #7823

merged 5 commits into from
Aug 9, 2020
+83 −66

Conversation

Mike-MF
Copy link
Member

@Mike-MF Mike-MF commented Jul 28, 2020

  • Convert Small Arms component to stringtable
  • Added Vector 45 additional magazines still listed as 30 rounds.

Mike-MF added 2 commits July 28, 2020 17:22
@Mike-MF
Convert Small Arms to Stringtable
4936b0e 
- Convert Small Arms component to stringtable
- Added Vector 45 additional magazines still listed as 30 rounds.
@Mike-MF
Newlines end of file
dfe1551
@Mike-MF Mike-MF mentioned this pull request Jul 28, 2020
Closed
@BrettMayson
Copy link
Member

BrettMayson commented Jul 28, 2020 •
edited
Loading

While this is being changed, English should have a space before mm, like 9 mm instead of 9mm

or I guess that could be a PR for all of ACE instead

@mharis001 mharis001 added the kind/translation Release Notes: **TRANSLATIONS:** label Jul 28, 2020
@mharis001 mharis001 added this to the 3.13.4 milestone Jul 28, 2020
PabstMirror
PabstMirror reviewed Jul 28, 2020
View reviewed changes
addons/smallarms/CfgMagazines.hpp Outdated
displaynameshort = "6.5mm Tracer";
};

class 100Rnd_65x39_caseless_mag : CA_Magazine {
displayname = "6.5mm 100Rnd Mag";
displayname = CSTRING(100Rnd_MX_Name);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why we are even changing these names??
vanilla is displayName = "6.5 mm 100Rnd Sand Mag";
and vanilla also has this mag which we don't touch
100Rnd_65x39_caseless_khaki_mag { displayName = "6.5 mm 100Rnd Khaki Mag";

I think it would be better to not touch any of these stings unless we have a reason to

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of the display names have been removed with the exception of those what have differing ammo counts now.

@Mike-MF @PabstMirror
Apply suggestions from code review
a7a2097 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@PabstMirror PabstMirror mentioned this pull request Aug 6, 2020
Merged
@PabstMirror PabstMirror merged commit 1626d05 into acemod:master Aug 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mharis001 mharis001 mharis001 approved these changes

@PabstMirror PabstMirror PabstMirror approved these changes

Assignees
No one assigned
Labels
kind/translation Release Notes: **TRANSLATIONS:**
Projects
None yet
Milestone
3.13.4
Development

Successfully merging this pull request may close these issues.
4 participants
@Mike-MF @BrettMayson @PabstMirror @mharis001