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.

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

Fix typo: Carrage -> Carriage #53327

Merged
merged 1 commit into from
May 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ public IEnumSettingViewModel CreateViewModel(FormattingSetting setting)
internal enum NewLineSetting
{
Newline,
CarrageReturn,
CarrageReturnNewline,
CarriageReturn,
CarriageReturnNewline,
NotSet
}

Expand All @@ -59,10 +59,10 @@ protected override void ChangePropertyTo(NewLineSetting newValue)
case NewLineSetting.Newline:
_setting.SetValue("\n");
break;
case NewLineSetting.CarrageReturn:
case NewLineSetting.CarriageReturn:
_setting.SetValue("\r");
break;
case NewLineSetting.CarrageReturnNewline:
case NewLineSetting.CarriageReturnNewline:
_setting.SetValue("\r\n");
break;
case NewLineSetting.NotSet:
Expand All @@ -76,8 +76,8 @@ protected override NewLineSetting GetCurrentValue()
return _setting.GetValue() switch
{
"\n" => NewLineSetting.Newline,
"\r" => NewLineSetting.CarrageReturn,
"\r\n" => NewLineSetting.CarrageReturnNewline,
"\r" => NewLineSetting.CarriageReturn,
"\r\n" => NewLineSetting.CarriageReturnNewline,
_ => NewLineSetting.NotSet,
};
}
Expand All @@ -89,8 +89,8 @@ protected override IReadOnlyDictionary<string, NewLineSetting> GetValuesAndDescr
static IEnumerable<(string description, NewLineSetting value)> EnumerateOptions()
{
yield return (ServicesVSResources.Newline_n, NewLineSetting.Newline);
yield return (ServicesVSResources.Carrage_Return_r, NewLineSetting.CarrageReturn);
yield return (ServicesVSResources.Carrage_Return_Newline_rn, NewLineSetting.CarrageReturnNewline);
yield return (ServicesVSResources.Carriage_Return_r, NewLineSetting.CarriageReturn);
yield return (ServicesVSResources.Carriage_Return_Newline_rn, NewLineSetting.CarriageReturnNewline);
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/VisualStudio/Core/Def/ServicesVSResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1662,11 +1662,11 @@ I agree to all of the foregoing:</value>
<data name="Analyzers" xml:space="preserve">
<value>Analyzers</value>
</data>
<data name="Carrage_Return_Newline_rn" xml:space="preserve">
<value>Carrage Return + Newline (\\r\\n)</value>
<data name="Carriage_Return_Newline_rn" xml:space="preserve">
<value>Carriage Return + Newline (\r\n)</value>
</data>
<data name="Carrage_Return_r" xml:space="preserve">
<value>Carrage Return (\\r)</value>
<data name="Carriage_Return_r" xml:space="preserve">
<value>Carriage Return (\r)</value>
</data>
<data name="Category" xml:space="preserve">
<value>Category</value>
Expand Down
12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf

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

12 changes: 6 additions & 6 deletions src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf

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