Commit d48526fb authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'whole-number-to-integer' into 'master'

Feature Flags Strategies: Rename "a whole number" to "an integer"

See merge request gitlab-org/gitlab!45444
parents 188ad44e 494ce490
...@@ -488,7 +488,9 @@ export default { ...@@ -488,7 +488,9 @@ export default {
:target="rolloutPercentageId(index)" :target="rolloutPercentageId(index)"
> >
{{ {{
s__('FeatureFlags|Percent rollout must be a whole number between 0 and 100') s__(
'FeatureFlags|Percent rollout must be an integer number between 0 and 100',
)
}} }}
</gl-tooltip> </gl-tooltip>
<span class="ml-1">%</span> <span class="ml-1">%</span>
......
...@@ -17,8 +17,8 @@ export default { ...@@ -17,8 +17,8 @@ export default {
}, },
}, },
i18n: { i18n: {
percentageDescription: __('Enter a whole number between 0 and 100'), percentageDescription: __('Enter an integer number number between 0 and 100'),
percentageInvalid: __('Percent rollout must be a whole number between 0 and 100'), percentageInvalid: __('Percent rollout must be an integer number between 0 and 100'),
percentageLabel: __('Percentage'), percentageLabel: __('Percentage'),
stickinessDescription: __('Consistency guarantee method'), stickinessDescription: __('Consistency guarantee method'),
stickinessLabel: __('Based on'), stickinessLabel: __('Based on'),
......
...@@ -16,9 +16,9 @@ export default { ...@@ -16,9 +16,9 @@ export default {
}, },
}, },
i18n: { i18n: {
rolloutPercentageDescription: __('Enter a whole number between 0 and 100'), rolloutPercentageDescription: __('Enter an integer number between 0 and 100'),
rolloutPercentageInvalid: s__( rolloutPercentageInvalid: s__(
'FeatureFlags|Percent rollout must be a whole number between 0 and 100', 'FeatureFlags|Percent rollout must be an integer number between 0 and 100',
), ),
rolloutPercentageLabel: s__('FeatureFlag|Percentage'), rolloutPercentageLabel: s__('FeatureFlag|Percentage'),
}, },
......
---
title: Rename "a whole number" to "an integer number" in feature flags strategies
merge_request: 45444
author:
type: changed
...@@ -9982,7 +9982,10 @@ msgstr "" ...@@ -9982,7 +9982,10 @@ msgstr ""
msgid "Enter a number" msgid "Enter a number"
msgstr "" msgstr ""
msgid "Enter a whole number between 0 and 100" msgid "Enter an integer number between 0 and 100"
msgstr ""
msgid "Enter an integer number number between 0 and 100"
msgstr "" msgstr ""
msgid "Enter at least three characters to search" msgid "Enter at least three characters to search"
...@@ -11343,7 +11346,7 @@ msgstr "" ...@@ -11343,7 +11346,7 @@ msgstr ""
msgid "FeatureFlags|Percent rollout (logged in users)" msgid "FeatureFlags|Percent rollout (logged in users)"
msgstr "" msgstr ""
msgid "FeatureFlags|Percent rollout must be a whole number between 0 and 100" msgid "FeatureFlags|Percent rollout must be an integer number between 0 and 100"
msgstr "" msgstr ""
msgid "FeatureFlags|Protected" msgid "FeatureFlags|Protected"
...@@ -19102,7 +19105,7 @@ msgstr "" ...@@ -19102,7 +19105,7 @@ msgstr ""
msgid "People without permission will never get a notification." msgid "People without permission will never get a notification."
msgstr "" msgstr ""
msgid "Percent rollout must be a whole number between 0 and 100" msgid "Percent rollout must be an integer number between 0 and 100"
msgstr "" msgstr ""
msgid "Percentage" msgid "Percentage"
......
...@@ -100,7 +100,7 @@ describe('feature_flags/components/strategies/flexible_rollout.vue', () => { ...@@ -100,7 +100,7 @@ describe('feature_flags/components/strategies/flexible_rollout.vue', () => {
}); });
}); });
describe('with percentage that is not a whole number', () => { describe('with percentage that is not an integer number', () => {
beforeEach(() => { beforeEach(() => {
wrapper = factory({ strategy: { parameters: { rollout: '3.14' } } }); wrapper = factory({ strategy: { parameters: { rollout: '3.14' } } });
}); });
......
...@@ -63,7 +63,7 @@ describe('~/feature_flags/components/strategies/percent_rollout.vue', () => { ...@@ -63,7 +63,7 @@ describe('~/feature_flags/components/strategies/percent_rollout.vue', () => {
}); });
}); });
describe('with percentage that is not a whole number', () => { describe('with percentage that is not an integer number', () => {
beforeEach(() => { beforeEach(() => {
wrapper = factory({ strategy: { parameters: { percentage: '3.14' } } }); wrapper = factory({ strategy: { parameters: { percentage: '3.14' } } });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment