Skip to content
This repository has been archived by the owner on Nov 2, 2023. It is now read-only.

Short label and guidance hint #253

Merged
merged 12 commits into from
Nov 9, 2021
Merged

Conversation

florianm
Copy link
Contributor

@florianm florianm commented Nov 4, 2021

Fixes deployment errors as discussed on Slack:

  • Fix: short is a reserved JS keyword, use dict['short'] instead of dict.short syntax. (thanks @issa-tseng)
  • Fix: Patch ES6 parameter defaults (Thanks Tom)
  • Improve: Made old forms robust against absence of short label and guidance hint.
  • Noop: Works with PR 18 to build2xlsform, but needs manual changing of language (ODK Build generates default language "English") to include language code (e.g. "English (en)") and XLSForms doesn't support short label yet
  • Test: Test report of running this locally
  • Docs: Updated CONTRIBUTING docs to include debugging steps for individual JS assets (Thanks Tom)

Florian Mayer and others added 12 commits December 2, 2020 11:37
* Timestamped form slug becomes now form version
* Sanitized form title component of form slug becomes form id
* Updated deps in Gemfile
* Fixed parameter defaults (ES6 style does not compile)
* Fixed incorrect use of "short" as variable name, using "shortlabel" instead througout
* Fixed non-existing translations for guidance and shortlabel
* INCORRECT: output now has "shortlabel" instead of "short" - need to replace or patch
* short is a protected word in JS
* use `dict[short]` syntax over `dict.short`
* Code comments now correctly reference support for "short"
* Contrib guide contains some examples of compilation issues
Copy link
Member

@yanokwa yanokwa left a comment

Choose a reason for hiding this comment

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

LGTM (and to @smoyth)

@yanokwa yanokwa merged commit d369d92 into getodk:master Nov 9, 2021
@florianm florianm deleted the short-guidance branch January 9, 2022 05:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants