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

Internationalization and multi track support #9

Closed
wants to merge 36 commits into from
Closed

Internationalization and multi track support #9

wants to merge 36 commits into from

Conversation

Wilkins
Copy link
Collaborator

@Wilkins Wilkins commented Apr 16, 2015

Hi Stefano,

Here is my latest contribution.
I added the following features :

  • Internationalization : English, French, Italian (The current version is the english one, I hope you can translate it)
  • Multi track support : this allows to handle multi track files, check/uncheck the tracks on the map, and export the visible tracks only.
  • Calculating the size foreach format
  • Some styling on the page.

I hope you'll like it and merge it.

Have a nice day.

Wilkins added 30 commits April 7, 2015 09:47
@Wilkins
Creating a working branch without social stuff
68ad49d
@Wilkins
i18n - first tests OK
a63a6fa
@Wilkins
Committing minidifed javascript before branch operations
733f295
@Wilkins
i18n - Basic architecture OK for i18n, need to continue to make it
0ce4d43 
dynamic
@Wilkins
i18n - Internalization almost done. Need some checking
c41d738
@Wilkins
i18n - Adding language selector - Everything seems OK
a2c1b77
@Wilkins
CSS - Cleanup
dedd2c2
@Wilkins
Travis - first tests
a5cdf71
@Wilkins
Vendors - Cleanup vendor/jquery-autocomplete (used for planes branch)
0aa523d
@Wilkins
Testing Travis conf
ee2e165
@Wilkins
Creating a working branch without social stuff
e64b4ec
@Wilkins
i18n - first tests OK
ec404de
@Wilkins
Committing minidifed javascript before branch operations
6f271c2
@Wilkins
i18n - Basic architecture OK for i18n, need to continue to make it
1dced8b 
dynamic
@Wilkins
i18n - Internalization almost done. Need some checking
2f4be6c
@Wilkins
i18n - Adding language selector - Everything seems OK
389b6b6
@Wilkins
CSS - Cleanup
65e89d6
@Wilkins
Travis - first tests
b54bce9
@Wilkins
Vendors - Cleanup vendor/jquery-autocomplete (used for planes branch)
0383db9
@Wilkins
Testing Travis conf
2e17070
@Wilkins
Testing Travis conf
4accbfd
@Wilkins
Grunt - refactoring grunt file
6c048aa
@Wilkins
Still trying travis conf
211bc07
@Wilkins
Checking package.json syntax
0eeafcf
@Wilkins
Merging
f4ec567
@Wilkins
Renaming js -> src
d710152
@Wilkins
Readding i18next submodule
30f1445
@Wilkins
Grunt update after js -> src renaming
daf67cb
@Wilkins
Remember the tolerance of each layer.
e5b2a2b
@Wilkins
First version of multi tracks support
51dc084
Wilkins added 5 commits April 12, 2015 22:41
@Wilkins
Adding i18N for multi tracks
d015e6b
@Wilkins
Multi-tracks - Managing several tracks in the gpx. Still need to correct
e6b2968 
the erase action and remove() methods.
@Wilkins
Removing layers from each tracks
7909181
@Wilkins
Layers - Finalisation of multitracks support.
b554c25 
- View OK
- Save OK
- Delete OK
- Selecting for export OK
@Wilkins
Formats - Calculate size by format
e4673ad 
Putting back all social stuff
Cleaning up useless functions
Multitracking OK
Almost ready for pull request
@Wilkins
Copy link
Collaborator Author

Wilkins commented Jul 29, 2015

Hi @stefanocudini
Did you have issues merging this PR ?

@stefanocudini
Copy link
Owner

no sorry github show a message:

This branch has conflicts that must be resolved
 Use the command line to resolve conflicts before continuing.

@Wilkins Can you verify please?
Your work is really great! Is shame that go to waste!

@stefanocudini stefanocudini reopened this Jul 29, 2015
@Wilkins
Copy link
Collaborator Author

Wilkins commented Aug 4, 2015

Replaced by this Pull Request : #11

@Wilkins Wilkins closed this Aug 4, 2015
@stefanocudini
Copy link
Owner

great!

@Wilkins Wilkins deleted the i18n branch January 20, 2016 22:33
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.
2 participants
@Wilkins @stefanocudini