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.

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

Jump to bottom

Formbuilder handles translations #1143

Merged
merged 29 commits into from
Feb 24, 2017
Merged

Formbuilder handles translations #1143

merged 29 commits into from
Feb 24, 2017

Conversation

dorey
Copy link
Contributor

@dorey dorey commented Feb 13, 2017

closes #787

dorey added 13 commits February 4, 2017 12:04
@dorey
added a simple "revert_to" method for testing form builder changes
f932bf4
@dorey
test asset.revert_to_version(...) method
8756a79
@dorey
asset.clone() returns new asset
c9d3e96
@dorey
refactoring form builder translations with thorough tests
6a01e35
@dorey
translations cont'd
88029ae
@dorey
more refactoring of how translations were handled
3046e2f
@dorey
adding es6-map polyfill as a dependency
6b1d3ee
@dorey
Handling all types of translated xlsforms except
42c5ac9 
those where:

> survey_content.translations.indexOf(null) > 0
@dorey
renaming "null_translation" to "active_translation_name"
db3fcd8 
which describes the value more clearly
@dorey
renamed "_preferred_translation" and
4737c52 
"_secondary_translation" variables
@dorey
changed primary_translation and secondary_translation
9d35c70 
to `_1` and `_2`
@dorey
asset_translation_utils
0fd9e91
@dorey
restructured asset_translation_utils and asset helper methods
6bf724b 
to allow adding and removing a translation.
@dorey dorey added the coded label Feb 13, 2017
@dorey
Copy link
Contributor Author

dorey commented Feb 23, 2017

There is a test here that is not being run by coveralls at the moment which would prevent the % from decreasing by this PR. I would like to run all the django tests with pytest. But for now, they are run separately by py.test -sx --ignore=node_modules

@dorey
Copy link
Contributor Author

dorey commented Feb 23, 2017

Related (and mostly closing) #1144 #949 and possibly #1054

dorey added 3 commits February 24, 2017 10:48
@dorey
* Some minor navigation & css changes
aeeb037 
* "X" button from the form builder goes back to the
  previous page (as was originally coded, but broke
  at some point)
@dorey
gitignoring some generated files
1cc4e58
@dorey
double save to preserve original asset content
55578ae
@dorey dorey removed the donotmerge label Feb 24, 2017
@jnm jnm merged commit dbf0a09 into master Feb 24, 2017
@jnm jnm deleted the formbuilder-handles-translations branch February 24, 2017 19:53
@jnm jnm removed the coded label Feb 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Forms with translations can't be previewed from the form builder
2 participants
@dorey @jnm