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

Calendar translate #3249

Merged
merged 13 commits into from Oct 31, 2023
Merged

Conversation

kaennchenstruggle
Copy link
Contributor

@kaennchenstruggle kaennchenstruggle commented Oct 25, 2023

Hello and thank you for wanting to contribute to the MagicMirror² project

Please make sure that you have followed these 4 rules before submitting your Pull Request:

  1. Base your pull requests against the develop branch.

DONE ;D

  1. Include these infos in the description:
  • Does the pull request solve a related issue?

NO

  • What does the pull request accomplish? Use a list if needed.

For calendar entries containing a year (e.g. DOB) in the title, the age can be calculated.

Example before:
grafik
after:
grafik

Achieved by adding a new keyword transform to customEvents

customEvents: [
                        {keyword: 'Geburtstag', symbol: 'birthday-cake', color: 'Gold', transform: { search: '^([^\']*) \'(\\d{4})$' , replace: '$1 ($2.)', yearmatchgroup: 2}},
                        {keyword: 'in Hamburg', transform: { search: ' in Hamburg$' , replace: ''}} 
		],

and therewith obsoleting titleReplace; a backward compatibility part is already included.

If yearmatchgroup is unset, behaviour is as in previous code (some additions to which RegExes are accepted, though)

If yearmatchgroup is set, it is considered the RegEx match group id, which will be used for calculating the age.

  • If it includes major visual changes please add screenshots.

NO

  1. Please run npm run lint:prettier before submitting so that style issues are fixed.

DONE

  1. Don't forget to add an entry about your changes to the CHANGELOG.md file.

DONE

Thanks again and have a nice day!

You too and if any questions, feel free to let me know.

@kaennchenstruggle
Copy link
Contributor Author

@rejas sorry to ask but I'm absolutely new to PR's... is there anything pending form my side (check a box, resolve an issue, etc...)?

@rejas
Copy link
Collaborator

rejas commented Oct 27, 2023

@rejas sorry to ask but I'm absolutely new to PR's... is there anything pending form my side (check a box, resolve an issue, etc...)?

Writing a test for your feature would be nice but its not a must. Adding a PR for the documentation repo would be needed once this is merged.

@rejas
Copy link
Collaborator

rejas commented Oct 27, 2023

Could you also check this:

"Check failure on line 119 in modules/default/calendar/calendarutils.js
GitHub
Actions
/ test (20.x)

Unexpected string concatenation"

@rejas
Copy link
Collaborator

rejas commented Oct 29, 2023

Seems that your changes make the
● Calendar utils tests › titleTransform and shorten combined › should replace the birthday and wrap nicely
fail, could you check it out (ignore the other failing tests for now)

@kaennchenstruggle
Copy link
Contributor Author

kaennchenstruggle commented Oct 29, 2023

Seems that your changes make the ● Calendar utils tests › titleTransform and shorten combined › should replace the birthday and wrap nicely fail, could you check it out (ignore the other failing tests for now)

Adjusted it, I hope it works out as I can't seem to get jest working on my system

@rejas
Copy link
Collaborator

rejas commented Oct 30, 2023

Adjusted it, I hope it works out as I can't seem to get jest working on my system

I did fix the linting issues but the tests still fail. How doesnt jest work on your system?

@kaennchenstruggle
Copy link
Contributor Author

Adjusted it, I hope it works out as I can't seem to get jest working on my system

I did fix the linting issues but the tests still fail. How doesnt jest work on your system?

Thanks for fixing, no clue about jest. I think I screwed up apt for whatever reason.

@rejas
Copy link
Collaborator

rejas commented Oct 30, 2023

Thanks for fixing, no clue about jest. I think I screwed up apt for whatever reason.

Can you psot the errors you get? normally the testing framework gets inspalled via npm, not apt.

your PR looks fine now, will merge it once I figure out the other failing test (unrelated to your changes)

@kaennchenstruggle
Copy link
Contributor Author

Thanks for fixing, no clue about jest. I think I screwed up apt for whatever reason.

Can you psot the errors you get? normally the testing framework gets inspalled via npm, not apt.

your PR looks fine now, will merge it once I figure out the other failing test (unrelated to your changes)

Thank you so much for your help on my first PR.

And thanks for pointing out the npm part, at least jest runs now. Still throwing some errors:

 FAIL  tests/e2e/modules/calendar_spec.js
  â—� Test suite failed to run

    SyntaxError: Bad control character in string literal in JSON at position 184320
        at JSON.parse (<anonymous>)

    > 1 | const jsdom = require("jsdom");
        |                               ^

@kaennchenstruggle
Copy link
Contributor Author

And also updated doc-repo (develop) with PR 207 MagicMirrorOrg/MagicMirror-Documentation#207 hope this is okay.

@rejas rejas merged commit 2a6e2aa into MagicMirrorOrg:develop Oct 31, 2023
5 checks passed
@MichMich MichMich mentioned this pull request Jan 1, 2024
MichMich added a commit that referenced this pull request Jan 1, 2024
## [2.26.0] - 01-01-2024

Thanks to: @bnitkin, @bugsounet, @dependabot, @jkriegshauser,
@kaennchenstruggle, @KristjanESPERANTO and @Ybbet.

Special thanks to @khassel, @rejas and @sdetweil for taking over most
(if not all) of the work on this release as project collaborators. This
version would not be there without their effort. Thank you guys! You are
awesome!

This release also marks the latest release by Michael Teeuw. For more
info, please read the following post: [A New Chapter for MagicMirror:
The Community Takes the
Lead](https://forum.magicmirror.builders/topic/18329/a-new-chapter-for-magicmirror-the-community-takes-the-lead).

### Added

- Added update notification updater (for 3rd party modules)
- Added node 21 to the test matrix
- Added transform object to calendar:customEvents
- Added ESLint rules for jest (including jest/expect-expect and
jest/no-done-callback)

### Removed

- Removed Codecov workflow (not working anymore, other workflow
required) (#3107)
- Removed titleReplace from calendar, replaced + extended by
customEvents (backward compatibility included) (#3249)
- Removed failing unit test (#3254)
- Removed some unused variables

### Updated

- Update electron to v27 and update other dependencies as well as github
actions
- Update newsfeed: Use `html-to-text` instead of regex for transform
description
- Review ESLint config (#3269)
- Updated dependencies
- Clock module: optionally display current moon phase in addition to
rise/set times
- electron is now per default started without gpu, if needed it must be
enabled with new env var `ELECTRON_ENABLE_GPU=1` on startup (#3226)
- Replace prettier by stylistic in ESLint config to lint JavaScript (and
disable some rules for `config/config.js*` files)
- Update node-ical to v0.17.1 and fix tests

### Fixed

- Avoid fade out/in on updateDom when many calendars are used
- Fix the option eventClass on customEvents.
- Fix yr API version in locationforecast and sunrise call (#3227)
- Fix cloneObject() function to respect RegExp (#3237)
- Fix newsfeed module for feeds using "a10:updated" tag (#3238)
- Fix issue template (#3167)
- Fix #3256 filter out bad results from rrule.between
- Fix calendar events sometimes not respecting deleted events (#3250)
- Fix electron loadurl locally on Windows when address "0.0.0.0" (#2550)
- Fix updatanotification (update_helper.js): catch error if reponse is
not an JSON format (check PM2)
- Fix missing typeof in calendar module
- Fix style issues after prettier update
- Fix calendar test (#3291) by moving "Exdate check" from e2e to
electron to run on a Thursday
- Fix calendar config params `fetchInterval` and `excludedEvents` were
never used from single calendar config (#3297)
- Fix MM_PORT variable not used in electron and allow full path for
MM_CONFIG_FILE variable (#3302)

---------

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Karsten Hassel <hassel@gmx.de>
Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com>
Co-authored-by: Veeck <github@veeck.de>
Co-authored-by: veeck <michael@veeck.de>
Co-authored-by: dWoolridge <dwoolridge@charter.net>
Co-authored-by: Johan <jojjepersson@yahoo.se>
Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com>
Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com>
Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com>
Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com>
Co-authored-by: buxxi <buxxi@omfilm.net>
Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com>
Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com>
Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
Co-authored-by: Dave Child <dave@addedbytes.com>
Co-authored-by: grenagit <46225780+grenagit@users.noreply.github.com>
Co-authored-by: Grena <grena@grenabox.fr>
Co-authored-by: Magnus Marthinsen <magmar@online.no>
Co-authored-by: Patrick <psieg@users.noreply.github.com>
Co-authored-by: Piotr Rajnisz <56397164+rajniszp@users.noreply.github.com>
Co-authored-by: Suthep Yonphimai <tomzt@users.noreply.github.com>
Co-authored-by: CarJem Generations (Carter Wallace) <cwallacecs@gmail.com>
Co-authored-by: Nicholas Fogal <nfogal.misc@gmail.com>
Co-authored-by: JakeBinney <126349119+JakeBinney@users.noreply.github.com>
Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com>
Co-authored-by: Oscar Björkman <17575446+oscarb@users.noreply.github.com>
Co-authored-by: Ismar Slomic <ismar@slomic.no>
Co-authored-by: Jørgen Veum-Wahlberg <jorgen.wahlberg@amedia.no>
Co-authored-by: Eddie Hung <6740044+eddiehung@users.noreply.github.com>
Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr>
Co-authored-by: bugsounet <bugsounet@bugsounet.fr>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Knapoc <Knapoc@users.noreply.github.com>
Co-authored-by: sam detweiler <sdetweil@gmail.com>
Co-authored-by: veeck <michael.veeck@nebenan.de>
Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com>
Co-authored-by: NolanKingdon <27908974+NolanKingdon@users.noreply.github.com>
Co-authored-by: J. Kenzal Hunter <kenzal.hunter@gmail.com>
Co-authored-by: Teddy <teddy.payet@gmail.com>
Co-authored-by: TeddyStarinvest <teddy.payet@starinvest.com>
Co-authored-by: martingron <61826403+martingron@users.noreply.github.com>
Co-authored-by: dgoth <132394363+dgoth@users.noreply.github.com>
Co-authored-by: kaennchenstruggle <54073894+kaennchenstruggle@users.noreply.github.com>
Co-authored-by: jkriegshauser <jkriegshauser@gmail.com>
Co-authored-by: Ben Nitkin <ben@nitkin.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants