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

Feature 1471 german labels 2 #1868

Merged
merged 50 commits into from
Jun 27, 2024
Merged

Feature 1471 german labels 2 #1868

merged 50 commits into from
Jun 27, 2024

Conversation

vismayajochem
Copy link
Contributor

@vismayajochem vismayajochem commented Jun 20, 2024

Summary of the discussion

I implemented several new german alternative labels, please check if everything is correct. To check see also the google doc https://docs.google.com/spreadsheets/d/1snsx6zF8dqXGM9WCX0EckrdGnorrB9lMnvdvP2fx9ZQ/edit#gid=687082420
I also implemented the english language tag to already existing english alternative labels.

Workflow checklist

Automation

Closes #

PR-Assignee

Reviewer

  • 🐙 Follow the Reviewer Guide
  • 🐙 Provided feedback and show sufficient appreciation for the work done

@vismayajochem vismayajochem self-assigned this Jun 20, 2024
vismayajochem added a commit that referenced this pull request Jun 20, 2024
entry to issues #1867 and #1868
@@ -2399,6 +2428,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/944
move govern axioms to oeo-shared-axioms
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724",
rdfs:comment "EU-EHS"@de,
rdfs:comment "Emissionshandelssystem der Europäischen Union"@de,
Copy link
Contributor

Choose a reason for hiding this comment

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

These two should be implemented as alternative label and not as rdfs:comment

@@ -2457,6 +2490,7 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1462
move axiom to oeo-shared-axioms
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1399
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1724",
rdfs:comment "EU-Klimapolitik"@de,
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be alternative label instead of rdf:comments

Copy link
Contributor

@l-emele l-emele left a comment

Choose a reason for hiding this comment

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

See suggestions on specific lines.

Copy link
Contributor Author

@vismayajochem vismayajochem left a comment

Choose a reason for hiding this comment

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

Correction from rdfs:comment to alternative label

src/ontology/edits/oeo-social.omn Outdated Show resolved Hide resolved
src/ontology/edits/oeo-social.omn Outdated Show resolved Hide resolved
src/ontology/edits/oeo-social.omn Outdated Show resolved Hide resolved
@vismayajochem
Copy link
Contributor Author

I also updated the google doc sheet and implemented the suggested changes from @l-emele

CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Contributor

@l-emele l-emele left a comment

Choose a reason for hiding this comment

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

I committed your latest changes and updated/fixed CHANGELOG.md.

Now everything looks fine and I thus approve.

@github-actions github-actions bot added oeo-model changes the oeo-model module oeo-physical changes the oeo-physical module oeo-sector oeo-shared changes the oeo-shared module oeo-social changes the oeo-social module labels Jun 25, 2024
@l-emele
Copy link
Contributor

l-emele commented Jun 25, 2024

I just say that this PR was behind the dev branch, so I merged dev and fixed resulting merge conflicts.

@vismayajochem vismayajochem merged commit ca25812 into dev Jun 27, 2024
4 checks passed
@vismayajochem vismayajochem deleted the feature-1471-german-labels_2 branch June 27, 2024 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
oeo-model changes the oeo-model module oeo-physical changes the oeo-physical module oeo-sector oeo-shared changes the oeo-shared module oeo-social changes the oeo-social module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants