mirror of
https://github.com/dwaxweiler/connector-mobilizon
synced 2025-06-05 21:59:25 +02:00
Compare commits
26 Commits
Author | SHA1 | Date | |
---|---|---|---|
07534e08ea | |||
32e87115b3 | |||
cee386acd2 | |||
70e0d96e1f | |||
4707fedee0 | |||
0b6350f03e | |||
39b6800e97 | |||
da9afa64c8 | |||
53393ef0df | |||
20d3d771c8 | |||
a6b713b47a | |||
05a2b2a2b3 | |||
cb0f29c008 | |||
de483e301c | |||
fcd8c79a62 | |||
02567fb1bd | |||
536a6c6686 | |||
744c0c593b | |||
d38d3c0906 | |||
f91c0a00fa | |||
fc64731921 | |||
23bd4f2d15 | |||
7795ccc36a | |||
0b3c998e56 | |||
e927bdf239 | |||
00d3a3be7c |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
|
.idea/
|
||||||
build/
|
build/
|
||||||
coverage/
|
coverage/
|
||||||
node_modules/
|
node_modules/
|
||||||
|
201
LICENSE.md
Normal file
201
LICENSE.md
Normal file
@ -0,0 +1,201 @@
|
|||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
@ -24,9 +24,11 @@ More details can be found in the [WordPress Plugin Directory](https://wordpress.
|
|||||||
6. Make sure screenshots are up-to-date.
|
6. Make sure screenshots are up-to-date.
|
||||||
7. Copy the built plugin into `/trunk` of SVN.
|
7. Copy the built plugin into `/trunk` of SVN.
|
||||||
8. Create a new tag of the new version: `svn cp trunk tags/<version>`
|
8. Create a new tag of the new version: `svn cp trunk tags/<version>`
|
||||||
9. Check the version number occurences in both folders.
|
9. Check the version number occurrences in both folders.
|
||||||
10. Commit everything together to the release SVN: `svn ci -m "release version <version>"`
|
10. Commit everything together to the release SVN: `svn ci -m "release version <version>"`
|
||||||
11. Commit and tag the new version in `git` too.
|
11. Commit the new version in git with the same message.
|
||||||
|
12. Tag the new version: `git tag v<version>`
|
||||||
|
13. Push the new tag to the repository: `git push --tags`
|
||||||
|
|
||||||
### Other commands
|
### Other commands
|
||||||
- Run ESLint: `npm run eslint`
|
- Run ESLint: `npm run eslint`
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 60 KiB |
Binary file not shown.
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 63 KiB |
Binary file not shown.
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 6.9 KiB |
2099
package-lock.json
generated
2099
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
26
package.json
26
package.json
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "connector-mobilizon",
|
"name": "connector-mobilizon",
|
||||||
"version": "0.5.0",
|
"version": "0.6.2",
|
||||||
"description": "Display mobilizon events in WordPress.",
|
"description": "Display Mobilizon events in WordPress.",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build-dev": "gulp dev",
|
"build-dev": "gulp dev",
|
||||||
@ -20,23 +20,23 @@
|
|||||||
},
|
},
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"graphql": "^15.5.0",
|
"graphql": "^15.5.1",
|
||||||
"graphql-request": "^3.4.0",
|
"graphql-request": "^3.5.0",
|
||||||
"luxon": "^1.26.0",
|
"luxon": "^2.0.2",
|
||||||
"object-hash": "^2.1.1"
|
"object-hash": "^2.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"ava": "^3.15.0",
|
"ava": "^3.15.0",
|
||||||
"c8": "^7.7.2",
|
"c8": "^7.8.0",
|
||||||
"del": "^6.0.0",
|
"del": "^6.0.0",
|
||||||
"eslint": "^7.25.0",
|
"eslint": "^7.32.0",
|
||||||
"eslint-plugin-ava": "^12.0.0",
|
"eslint-plugin-ava": "^12.0.0",
|
||||||
"esm": "^3.2.25",
|
"esm": "^3.2.25",
|
||||||
"gulp": "^4.0.2",
|
"gulp": "^4.0.2",
|
||||||
"gulp-replace": "^1.1.2",
|
"gulp-replace": "^1.1.3",
|
||||||
"jsdom": "^16.5.3",
|
"jsdom": "^17.0.0",
|
||||||
"webpack": "^5.36.2",
|
"webpack": "^5.51.1",
|
||||||
"webpack-cli": "^4.6.0",
|
"webpack-cli": "^4.8.0",
|
||||||
"webpack-stream": "^6.1.2"
|
"webpack-stream": "^6.1.2"
|
||||||
},
|
},
|
||||||
"ava": {
|
"ava": {
|
||||||
@ -51,6 +51,6 @@
|
|||||||
"niceName": "Connector for Mobilizon",
|
"niceName": "Connector for Mobilizon",
|
||||||
"phpMinimumVersion": 5.4,
|
"phpMinimumVersion": 5.4,
|
||||||
"wordpressMinimumVersion": 5.6,
|
"wordpressMinimumVersion": 5.6,
|
||||||
"wordpressTestedUpToVersion": 5.7
|
"wordpressTestedUpToVersion": 5.8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,25 @@
|
|||||||
#### Fixed
|
#### Fixed
|
||||||
#### Security
|
#### Security
|
||||||
|
|
||||||
|
### [0.6.2] - 2021-08-24
|
||||||
|
#### Changed
|
||||||
|
- Update dependencies
|
||||||
|
#### Fixed
|
||||||
|
- Fix empty WordPress timezone_string option resulting in Invalid DateTime
|
||||||
|
|
||||||
|
### [0.6.1] - 2021-07-13
|
||||||
|
#### Changed
|
||||||
|
- Confirm compatibility with WordPress 5.8
|
||||||
|
- Update dependencies
|
||||||
|
|
||||||
|
### [0.6.0] - 2021-06-02
|
||||||
|
#### Added
|
||||||
|
- Optionally display the current offset as short name after the time via the general plugin settings
|
||||||
|
#### Changed
|
||||||
|
- Update dependencies
|
||||||
|
#### Fixed
|
||||||
|
- Capitalise Mobilizon name in description
|
||||||
|
|
||||||
### [0.5.0] - 2021-05-06
|
### [0.5.0] - 2021-05-06
|
||||||
#### Added
|
#### Added
|
||||||
- Localise dates based on the WordPress locale and time zone
|
- Localise dates based on the WordPress locale and time zone
|
||||||
|
@ -6,6 +6,26 @@ test('#getShortDate usual date', t => {
|
|||||||
t.is(d.getShortDate(), '24/12/2020')
|
t.is(d.getShortDate(), '24/12/2020')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('#getShortDate usual date with timezone string', t => {
|
||||||
|
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: 'Europe/Rome' })
|
||||||
|
t.is(d.getShortDate(), '24/12/2020')
|
||||||
|
})
|
||||||
|
|
||||||
|
test('#getShortDate usual date with fixed offset', t => {
|
||||||
|
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: 'UTC+02:00' })
|
||||||
|
t.is(d.getShortDate(), '24/12/2020')
|
||||||
|
})
|
||||||
|
|
||||||
|
test('#getShortDate usual date with fixed offset without UTC prefix', t => {
|
||||||
|
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: '+02:00' })
|
||||||
|
t.is(d.getShortDate(), '24/12/2020')
|
||||||
|
})
|
||||||
|
|
||||||
|
test('#getShortDate usual date with empty time zone', t => {
|
||||||
|
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: '' })
|
||||||
|
t.is(d.getShortDate(), '24/12/2020')
|
||||||
|
})
|
||||||
|
|
||||||
test('#get24Time usual time', t => {
|
test('#get24Time usual time', t => {
|
||||||
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
|
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
|
||||||
t.is(d.get24Time(), '16:45')
|
t.is(d.get24Time(), '16:45')
|
||||||
@ -51,3 +71,8 @@ test('#getCurrentDatetimeAsString correct format', t => {
|
|||||||
t.is(d[19], '.')
|
t.is(d[19], '.')
|
||||||
t.is(d[d.length-3], ':')
|
t.is(d[d.length-3], ':')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('#getShortOffsetName usual time', t => {
|
||||||
|
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
|
||||||
|
t.is(d.getShortOffsetName(), 'UTC')
|
||||||
|
})
|
||||||
|
@ -3,6 +3,12 @@ import { DateTime } from 'luxon'
|
|||||||
export default class DateTimeWrapper {
|
export default class DateTimeWrapper {
|
||||||
|
|
||||||
constructor({ locale = 'en-GB', text, timeZone = 'utc' } = {}) {
|
constructor({ locale = 'en-GB', text, timeZone = 'utc' } = {}) {
|
||||||
|
if (!timeZone) {
|
||||||
|
timeZone = 'utc'
|
||||||
|
}
|
||||||
|
if (timeZone.includes(':') && timeZone.substring(0, 3).toUpperCase() !== 'UTC') {
|
||||||
|
timeZone = 'UTC' + timeZone
|
||||||
|
}
|
||||||
this.dateTime = DateTime.fromISO(text, { locale, zone: timeZone })
|
this.dateTime = DateTime.fromISO(text, { locale, zone: timeZone })
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -10,6 +16,10 @@ export default class DateTimeWrapper {
|
|||||||
return this.dateTime.toLocaleString(DateTime.DATE_SHORT)
|
return this.dateTime.toLocaleString(DateTime.DATE_SHORT)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getShortOffsetName() {
|
||||||
|
return this.dateTime.offsetNameShort
|
||||||
|
}
|
||||||
|
|
||||||
get24Time() {
|
get24Time() {
|
||||||
return this.dateTime.toLocaleString(DateTime.TIME_24_SIMPLE)
|
return this.dateTime.toLocaleString(DateTime.TIME_24_SIMPLE)
|
||||||
}
|
}
|
||||||
|
@ -5,6 +5,7 @@ export function displayEvents({ data, document, list }) {
|
|||||||
const locale = list.getAttribute('data-locale')
|
const locale = list.getAttribute('data-locale')
|
||||||
const maxEventsCount = list.getAttribute('data-maximum')
|
const maxEventsCount = list.getAttribute('data-maximum')
|
||||||
const timeZone = list.getAttribute('data-time-zone')
|
const timeZone = list.getAttribute('data-time-zone')
|
||||||
|
const isShortOffsetNameShown = list.hasAttribute('data-is-short-offset-name-shown')
|
||||||
const events = data.events ? data.events.elements : data.group.organizedEvents.elements
|
const events = data.events ? data.events.elements : data.group.organizedEvents.elements
|
||||||
const eventsCount = Math.min(maxEventsCount, events.length)
|
const eventsCount = Math.min(maxEventsCount, events.length)
|
||||||
for (let i = 0; i < eventsCount; i++) {
|
for (let i = 0; i < eventsCount; i++) {
|
||||||
@ -16,7 +17,13 @@ export function displayEvents({ data, document, list }) {
|
|||||||
const br = document.createElement('br')
|
const br = document.createElement('br')
|
||||||
li.appendChild(br)
|
li.appendChild(br)
|
||||||
|
|
||||||
const date = Formatter.formatDate({ locale, start: events[i].beginsOn, end: events[i].endsOn, timeZone })
|
const date = Formatter.formatDate({
|
||||||
|
locale,
|
||||||
|
start: events[i].beginsOn,
|
||||||
|
end: events[i].endsOn,
|
||||||
|
timeZone,
|
||||||
|
isShortOffsetNameShown,
|
||||||
|
})
|
||||||
const textnode = document.createTextNode(date)
|
const textnode = document.createTextNode(date)
|
||||||
li.appendChild(textnode)
|
li.appendChild(textnode)
|
||||||
|
|
||||||
|
@ -6,11 +6,21 @@ test('#formatDate one date', t => {
|
|||||||
t.is(date, '15/04/2021 10:30 - 15:30')
|
t.is(date, '15/04/2021 10:30 - 15:30')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('#formatDate one date with short offset name', t => {
|
||||||
|
const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-15T15:30:00Z', isShortOffsetNameShown: true })
|
||||||
|
t.is(date, '15/04/2021 10:30 - 15:30 (UTC)')
|
||||||
|
})
|
||||||
|
|
||||||
test('#formatDate two dates', t => {
|
test('#formatDate two dates', t => {
|
||||||
const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-16T15:30:00Z' })
|
const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-16T15:30:00Z' })
|
||||||
t.is(date, '15/04/2021 10:30 - 16/04/2021 15:30')
|
t.is(date, '15/04/2021 10:30 - 16/04/2021 15:30')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('#formatDate two dates with short offset name', t => {
|
||||||
|
const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-16T15:30:00Z', isShortOffsetNameShown: true })
|
||||||
|
t.is(date, '15/04/2021 10:30 (UTC) - 16/04/2021 15:30 (UTC)')
|
||||||
|
})
|
||||||
|
|
||||||
test('#formatLocation both parameters', t => {
|
test('#formatLocation both parameters', t => {
|
||||||
const date = Formatter.formatLocation({ description: 'a', locality: 'b' })
|
const date = Formatter.formatLocation({ description: 'a', locality: 'b' })
|
||||||
t.is(date, 'a, b')
|
t.is(date, 'a, b')
|
||||||
|
@ -2,16 +2,24 @@ import DateTimeWrapper from './date-time-wrapper'
|
|||||||
|
|
||||||
export default class Formatter {
|
export default class Formatter {
|
||||||
|
|
||||||
static formatDate({ locale, timeZone, start, end }) {
|
static formatDate({ locale, timeZone, start, end, isShortOffsetNameShown }) {
|
||||||
const startDateTime = new DateTimeWrapper({ locale, text: start, timeZone })
|
const startDateTime = new DateTimeWrapper({ locale, text: start, timeZone })
|
||||||
const endDateTime = new DateTimeWrapper({ locale, text: end, timeZone })
|
const endDateTime = new DateTimeWrapper({ locale, text: end, timeZone })
|
||||||
let dateText = startDateTime.getShortDate()
|
let dateText = startDateTime.getShortDate()
|
||||||
dateText += ' ' + startDateTime.get24Time()
|
dateText += ' ' + startDateTime.get24Time()
|
||||||
dateText += ' - '
|
|
||||||
if (!startDateTime.equalsDate(endDateTime)) {
|
if (!startDateTime.equalsDate(endDateTime)) {
|
||||||
|
if (isShortOffsetNameShown) {
|
||||||
|
dateText += ' (' + startDateTime.getShortOffsetName() + ')'
|
||||||
|
}
|
||||||
|
dateText += ' - '
|
||||||
dateText += endDateTime.getShortDate() + ' '
|
dateText += endDateTime.getShortDate() + ' '
|
||||||
|
} else {
|
||||||
|
dateText += ' - '
|
||||||
}
|
}
|
||||||
dateText += endDateTime.get24Time()
|
dateText += endDateTime.get24Time()
|
||||||
|
if (isShortOffsetNameShown) {
|
||||||
|
dateText += ' (' + endDateTime.getShortOffsetName() + ')'
|
||||||
|
}
|
||||||
return dateText
|
return dateText
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,7 +29,8 @@ class EventsListShortcut {
|
|||||||
$locale = str_replace('_', '-', get_locale());
|
$locale = str_replace('_', '-', get_locale());
|
||||||
$groupName = $atts_with_overriden_defaults['group-name'];
|
$groupName = $atts_with_overriden_defaults['group-name'];
|
||||||
$url = Settings::getUrl();
|
$url = Settings::getUrl();
|
||||||
$timeZone = get_option('timezone_string');
|
$timeZone = wp_timezone_string();
|
||||||
|
$isShortOffsetNameShown = Settings::isShortOffsetNameShown();
|
||||||
|
|
||||||
ob_start();
|
ob_start();
|
||||||
require dirname(__DIR__) . '/view/events-list.php';
|
require dirname(__DIR__) . '/view/events-list.php';
|
||||||
|
@ -30,7 +30,8 @@ class EventsListWidget extends \WP_Widget {
|
|||||||
$locale = str_replace('_', '-', get_locale());
|
$locale = str_replace('_', '-', get_locale());
|
||||||
$groupName = isset($options['groupName']) ? $options['groupName'] : '';
|
$groupName = isset($options['groupName']) ? $options['groupName'] : '';
|
||||||
$url = Settings::getUrl();
|
$url = Settings::getUrl();
|
||||||
$timeZone = get_option('timezone_string');
|
$timeZone = wp_timezone_string();
|
||||||
|
$isShortOffsetNameShown = Settings::isShortOffsetNameShown();
|
||||||
|
|
||||||
require dirname(__DIR__) . '/view/events-list.php';
|
require dirname(__DIR__) . '/view/events-list.php';
|
||||||
|
|
||||||
|
@ -9,9 +9,12 @@ if (!defined('ABSPATH')) {
|
|||||||
class Settings {
|
class Settings {
|
||||||
|
|
||||||
private static $DEFAULT_OPTION_URL = 'https://mobilizon.fr';
|
private static $DEFAULT_OPTION_URL = 'https://mobilizon.fr';
|
||||||
|
private static $DEFAULT_IS_SHORT_OFFSET_NAME_SHOWN = false;
|
||||||
private static $PAGE_NAME = 'wordpress_mobilizon';
|
private static $PAGE_NAME = 'wordpress_mobilizon';
|
||||||
private static $OPTIONS_GROUP_NAME = 'wordpress_mobilizon';
|
private static $OPTIONS_GROUP_NAME = 'wordpress_mobilizon';
|
||||||
|
private static $OPTION_NAME_IS_SHORT_OFFSET_NAME_SHOWN = 'wordpress_mobilizon_is_short_offset_name_shown';
|
||||||
private static $OPTION_NAME_URL = 'wordpress_mobilizon_url';
|
private static $OPTION_NAME_URL = 'wordpress_mobilizon_url';
|
||||||
|
private static $SETTING_FIELD_NAME_IS_SHORT_OFFSET_NAME_SHOWN = 'wordpress_mobilizon_field_is_short_offset_name_shown';
|
||||||
private static $SETTING_FIELD_NAME_URL = 'wordpress_mobilizon_field_url';
|
private static $SETTING_FIELD_NAME_URL = 'wordpress_mobilizon_field_url';
|
||||||
private static $SETTINGS_SECTION_NAME = 'wordpress_mobilizon_section_general';
|
private static $SETTINGS_SECTION_NAME = 'wordpress_mobilizon_section_general';
|
||||||
|
|
||||||
@ -21,6 +24,10 @@ class Settings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static function init_settings() {
|
public static function init_settings() {
|
||||||
|
register_setting(
|
||||||
|
self::$OPTIONS_GROUP_NAME,
|
||||||
|
self::$OPTION_NAME_IS_SHORT_OFFSET_NAME_SHOWN
|
||||||
|
);
|
||||||
register_setting(
|
register_setting(
|
||||||
self::$OPTIONS_GROUP_NAME,
|
self::$OPTIONS_GROUP_NAME,
|
||||||
self::$OPTION_NAME_URL,
|
self::$OPTION_NAME_URL,
|
||||||
@ -44,6 +51,21 @@ class Settings {
|
|||||||
'label_for' => self::$SETTING_FIELD_NAME_URL
|
'label_for' => self::$SETTING_FIELD_NAME_URL
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
add_settings_field(
|
||||||
|
self::$SETTING_FIELD_NAME_IS_SHORT_OFFSET_NAME_SHOWN,
|
||||||
|
__('Display named offset', 'connector-mobilizon'),
|
||||||
|
'MobilizonConnector\Settings::output_field_is_short_offset_name_shown',
|
||||||
|
self::$PAGE_NAME,
|
||||||
|
self::$SETTINGS_SECTION_NAME,
|
||||||
|
array(
|
||||||
|
'label_for' => self::$SETTING_FIELD_NAME_IS_SHORT_OFFSET_NAME_SHOWN
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function output_field_is_short_offset_name_shown($args) {
|
||||||
|
$isShortOffsetNameShown = self::isShortOffsetNameShown();
|
||||||
|
require dirname(__DIR__) . '/view/settings/is-short-offset-name-shown-field.php';
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function output_field_url($args) {
|
public static function output_field_url($args) {
|
||||||
@ -84,15 +106,21 @@ class Settings {
|
|||||||
require dirname(__DIR__) . '/view/settings/page.php';
|
require dirname(__DIR__) . '/view/settings/page.php';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function isShortOffsetNameShown() {
|
||||||
|
return get_option(self::$OPTION_NAME_IS_SHORT_OFFSET_NAME_SHOWN);
|
||||||
|
}
|
||||||
|
|
||||||
public static function getUrl() {
|
public static function getUrl() {
|
||||||
return get_option(self::$OPTION_NAME_URL);
|
return get_option(self::$OPTION_NAME_URL);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function setDefaultOptions() {
|
public static function setDefaultOptions() {
|
||||||
|
add_option(self::$OPTION_NAME_IS_SHORT_OFFSET_NAME_SHOWN, self::$DEFAULT_IS_SHORT_OFFSET_NAME_SHOWN);
|
||||||
add_option(self::$OPTION_NAME_URL, self::$DEFAULT_OPTION_URL);
|
add_option(self::$OPTION_NAME_URL, self::$DEFAULT_OPTION_URL);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function deleteAllOptions() {
|
public static function deleteAllOptions() {
|
||||||
|
delete_option(self::$OPTION_NAME_IS_SHORT_OFFSET_NAME_SHOWN);
|
||||||
delete_option(self::$OPTION_NAME_URL);
|
delete_option(self::$OPTION_NAME_URL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,11 +16,12 @@ License: <wordpress-license>
|
|||||||
|
|
||||||
Features
|
Features
|
||||||
- Display events as widget and as shortcut
|
- Display events as widget and as shortcut
|
||||||
- Display events' title, date and location if available
|
- Display events' title, date, and location if available
|
||||||
|
- Cache requests' responses for 2 minutes in the browser's `sessionStorage`
|
||||||
- Configure number of events to show per widget and per shortcut
|
- Configure number of events to show per widget and per shortcut
|
||||||
- Optionally filter events by a specific group per widget and per shortcut
|
- Optionally filter events by a specific group per widget and per shortcut
|
||||||
- Set the URL of the Mobilizon instance globally in the settings
|
- Set the URL of the Mobilizon instance in the settings
|
||||||
- Cache requests' responses for 2 minutes in the browser's `sessionStorage`
|
- Toggle adding named offset in brackets after the time in the settings
|
||||||
|
|
||||||
Shortcut format with limiting the number of events to show to 3 for example: `[<wordpress-name>-events-list events-count=3]`
|
Shortcut format with limiting the number of events to show to 3 for example: `[<wordpress-name>-events-list events-count=3]`
|
||||||
Optionally, you can only show the events of a specific group by indicatings its name: `[<wordpress-name>-events-list events-count=3 group-name="mygroup"]`
|
Optionally, you can only show the events of a specific group by indicatings its name: `[<wordpress-name>-events-list events-count=3 group-name="mygroup"]`
|
||||||
@ -35,6 +36,25 @@ The source code is available on [Github](https://github.com/dwaxweiler/connector
|
|||||||
|
|
||||||
## Changelog
|
## Changelog
|
||||||
|
|
||||||
|
### [0.6.2] - 2021-08-24
|
||||||
|
#### Changed
|
||||||
|
- Update dependencies
|
||||||
|
#### Fixed
|
||||||
|
- Fix empty WordPress timezone_string option resulting in Invalid DateTime
|
||||||
|
|
||||||
|
### [0.6.1] - 2021-07-13
|
||||||
|
#### Changed
|
||||||
|
- Confirm compatibility with WordPress 5.8
|
||||||
|
- Update dependencies
|
||||||
|
|
||||||
|
### [0.6.0] - 2021-06-02
|
||||||
|
#### Added
|
||||||
|
- Optionally display the current offset as short name after the time via the general plugin settings
|
||||||
|
#### Changed
|
||||||
|
- Update dependencies
|
||||||
|
#### Fixed
|
||||||
|
- Capitalise Mobilizon name in description
|
||||||
|
|
||||||
### [0.5.0] - 2021-05-06
|
### [0.5.0] - 2021-05-06
|
||||||
#### Added
|
#### Added
|
||||||
- Localise dates based on the WordPress locale and time zone
|
- Localise dates based on the WordPress locale and time zone
|
||||||
|
@ -9,6 +9,7 @@ if (!defined('ABSPATH')) {
|
|||||||
data-locale="<?php echo esc_attr($locale); ?>"
|
data-locale="<?php echo esc_attr($locale); ?>"
|
||||||
data-maximum="<?php echo esc_attr($eventsCount); ?>"
|
data-maximum="<?php echo esc_attr($eventsCount); ?>"
|
||||||
data-group-name="<?php echo esc_attr($groupName); ?>"
|
data-group-name="<?php echo esc_attr($groupName); ?>"
|
||||||
data-time-zone="<?php echo esc_attr($timeZone); ?>">
|
data-time-zone="<?php echo esc_attr($timeZone); ?>"
|
||||||
|
<?php echo $isShortOffsetNameShown ? 'data-is-short-offset-name-shown' : ''; ?>>
|
||||||
<li style="display: none;"><?php esc_html_e('The events could not be loaded!', 'connector-mobilizon'); ?></li>
|
<li style="display: none;"><?php esc_html_e('The events could not be loaded!', 'connector-mobilizon'); ?></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -0,0 +1,13 @@
|
|||||||
|
<?php
|
||||||
|
// Exit if this file is called directly.
|
||||||
|
if (!defined('ABSPATH')) {
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<input id="<?php echo esc_attr($args['label_for']); ?>"
|
||||||
|
name="<?php echo esc_attr(self::$OPTION_NAME_IS_SHORT_OFFSET_NAME_SHOWN); ?>"
|
||||||
|
type="checkbox"
|
||||||
|
<?php echo $isShortOffsetNameShown == true ? 'checked' : ''; ?>>
|
||||||
|
<p class="description">
|
||||||
|
<?php esc_html_e('The time zone of this WordPress installation is used. Whether the current offset should be displayed in brackets after the time, e.g. 10:00 (UTC)', 'connector-mobilizon'); ?>
|
||||||
|
</p>
|
Reference in New Issue
Block a user