Skip to content

Develop #19

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

Merged
merged 6 commits into from
Jul 26, 2025
Merged

Develop #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86ce09e
Update language data and generated files
Jul 17, 2025
93861ef
Use sub tasks for actions
ptr727 Jul 17, 2025
ab4d0cf
Merge branch 'develop' into update-languagedata
ptr727 Jul 19, 2025
9ecfb29
Merge pull request #17 from ptr727/update-languagedata
ptr727 Jul 19, 2025
f999e9b
Always write as CRLF
ptr727 Jul 26, 2025
88d0045
Merge branch 'main' into develop
ptr727 Jul 26, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/merge-bot-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Merge dependabot non-major updates
- name: Merge PR
if: steps.metadata.outputs.update-type != 'version-update:semver-major'
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

merge-languagedata:
name: Merge language data PR's
name: Merge language data PRs
runs-on: ubuntu-latest
if: github.actor == 'github-actions[bot]' && github.event.pull_request.base.ref == 'update-languagedata'
permissions:
Expand All @@ -42,7 +42,7 @@ jobs:

steps:

- name: Merge language data PRs
- name: Merge PR
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ concurrency:
jobs:

test:
uses: ./.github/workflows/test.yml
name: Run tests
uses: ./.github/workflows/test-task.yml
secrets: inherit

publish:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ concurrency:
jobs:

test:
uses: ./.github/workflows/test.yml
name: Run tests
uses: ./.github/workflows/test-task.yml
secrets: inherit
0 .github/workflows/test.yml → .github/workflows/test-task.yml
View file
Open in desktop
File renamed without changes.
116 changes: 66 additions & 50 deletions LanguageTags/Iso6392Data.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public partial class Iso6392Data
internal static void WriteFile(string fileName, string value)
{
// Always write as CRLF with newline at the end
if (Environment.NewLine != "\r\n")
if (value.Contains('\n') && !value.Contains('\r'))
{
value = value.Replace("\n", "\r\n");
}
Expand Down Expand Up @@ -77,73 +77,89 @@ public static void SaveJson(string fileName, Iso6392Data iso6392) =>
public static void GenCode(string fileName, Iso6392Data iso6392)
{
StringBuilder stringBuilder = new();
_ = stringBuilder.AppendLine(
"""
// This file is generated by LanguageTagsCreate
_ = stringBuilder
.Append(
"""
// This file is generated by LanguageTagsCreate

namespace ptr727.LanguageTags;
namespace ptr727.LanguageTags;

public partial class Iso6392Data
{
public static Iso6392Data Create() =>
new()
{
RecordList =
[
"""
);
public partial class Iso6392Data
{
public static Iso6392Data Create() =>
new()
{
RecordList =
[
"""
)
.Append("\r\n");

foreach (Record record in iso6392.RecordList)
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$$"""
new()
{
"""
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$$"""
new()
{
"""
)
.Append("\r\n");
if (!string.IsNullOrEmpty(record.Part2B))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" Part2B = \"{record.Part2B}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" Part2B = \"{record.Part2B}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.Part2T))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" Part2T = \"{record.Part2T}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" Part2T = \"{record.Part2T}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.Part1))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" Part1 = \"{record.Part1}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" Part1 = \"{record.Part1}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.RefName))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" RefName = \"{record.RefName}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" RefName = \"{record.RefName}\","
)
.Append("\r\n");
}
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$$"""
},
"""
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$$"""
},
"""
)
.Append("\r\n");
}
_ = stringBuilder.AppendLine(
"""
],
};
}
"""
);
_ = stringBuilder
.Append(
"""
],
};
}
"""
)
.Append("\r\n");

WriteFile(fileName, stringBuilder.ToString());
}
Expand Down
150 changes: 87 additions & 63 deletions LanguageTags/Iso6393Data.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,100 +80,124 @@ public static void SaveJson(string fileName, Iso6393Data iso6393) =>
public static void GenCode(string fileName, Iso6393Data iso6393)
{
StringBuilder stringBuilder = new();
_ = stringBuilder.AppendLine(
"""
// This file is generated by LanguageTagsCreate
_ = stringBuilder
.Append(
"""
// This file is generated by LanguageTagsCreate

namespace ptr727.LanguageTags;
namespace ptr727.LanguageTags;

public partial class Iso6393Data
{
public static Iso6393Data Create() =>
new()
{
RecordList =
[
"""
);
public partial class Iso6393Data
{
public static Iso6393Data Create() =>
new()
{
RecordList =
[
"""
)
.Append("\r\n");

foreach (Record record in iso6393.RecordList)
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$$"""
new()
{
"""
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$$"""
new()
{
"""
)
.Append("\r\n");
if (!string.IsNullOrEmpty(record.Id))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" Id = \"{record.Id}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" Id = \"{record.Id}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.Part2B))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" Part2B = \"{record.Part2B}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" Part2B = \"{record.Part2B}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.Part2T))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" Part2T = \"{record.Part2T}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" Part2T = \"{record.Part2T}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.Part1))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" Part1 = \"{record.Part1}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" Part1 = \"{record.Part1}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.Scope))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" Scope = \"{record.Scope}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" Scope = \"{record.Scope}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.LanguageType))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" LanguageType = \"{record.LanguageType}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" LanguageType = \"{record.LanguageType}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.RefName))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" RefName = \"{record.RefName}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" RefName = \"{record.RefName}\","
)
.Append("\r\n");
}
if (!string.IsNullOrEmpty(record.Comment))
{
_ = stringBuilder.AppendLine(
CultureInfo.InvariantCulture,
$" Comment = \"{record.Comment}\","
);
_ = stringBuilder
.Append(
CultureInfo.InvariantCulture,
$" Comment = \"{record.Comment}\","
)
.Append("\r\n");
}
_ = stringBuilder.AppendLine(
_ = stringBuilder
.Append(
"""
},
"""
)
.Append("\r\n");
}
_ = stringBuilder
.Append(
"""
},
],
};
}
"""
);
}
_ = stringBuilder.AppendLine(
"""
],
};
}
"""
);
)
.Append("\r\n");

Iso6392Data.WriteFile(fileName, stringBuilder.ToString());
}
Expand Down
Loading