{"action":"closed","number":341,"pull_request":{"url":"https://api.github.com/repos/IMA-WorldHealth/bhima/pulls/341","id":27496931,"html_url":"https://github.com/IMA-WorldHealth/bhima/pull/341","diff_url":"https://github.com/IMA-WorldHealth/bhima/pull/341.diff","patch_url":"https://github.com/IMA-WorldHealth/bhima/pull/341.patch","issue_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/issues/341","number":341,"state":"closed","locked":false,"title":"Alphabetize all translation items","user":{"login":"jmcameron","id":62145,"avatar_url":"https://avatars.githubusercontent.com/u/62145?v=3","gravatar_id":"","url":"https://api.github.com/users/jmcameron","html_url":"https://github.com/jmcameron","followers_url":"https://api.github.com/users/jmcameron/followers","following_url":"https://api.github.com/users/jmcameron/following{/other_user}","gists_url":"https://api.github.com/users/jmcameron/gists{/gist_id}","starred_url":"https://api.github.com/users/jmcameron/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmcameron/subscriptions","organizations_url":"https://api.github.com/users/jmcameron/orgs","repos_url":"https://api.github.com/users/jmcameron/repos","events_url":"https://api.github.com/users/jmcameron/events{/privacy}","received_events_url":"https://api.github.com/users/jmcameron/received_events","type":"User","site_admin":false},"body":"WARNING!  This will probably cause merge conflicts for anyone that has pull requests with language changes.  To deal with this, follow this procedure (after this branch has been merged into development):\r\n\r\n  1. Do not update your local copy of development yet\r\n  2. Checkout your branch branch, but DO NOT update it\r\n  3. Use 'git diff development client/src/i18n' and make notes of any changes you have made to the translations\r\n  4. Checkout development and updated it (using 'git pull')\r\n  5. Copy client/src/i18n/*.json to a convenient directory (outside of the bhima files)\r\n  6. Checkout your branch\r\n  7. Merge with development:  'git merge upstream/development'\r\n  8. If you get merge conflicts, do this:\r\n      * Copy the saved and updated *.json translation files to client/src/i18n/\r\n      * Update the translation files with the modifications (if any) from step 3\r\n      * Tell git the merge conflicts are resolved:   git add client/src/i18n/*.json\r\n      * Tell git to continue the merge:   git commit\r\n  9. Push the changes back to your branch on github","created_at":"2015-01-16T10:41:32Z","updated_at":"2015-01-16T10:46:57Z","closed_at":"2015-01-16T10:46:57Z","merged_at":"2015-01-16T10:46:57Z","merge_commit_sha":"5fa80b1d7a01518777f53e0bcc93786dc17e30f1","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/pulls/341/commits","review_comments_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/pulls/341/comments","review_comment_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/pulls/comments/{number}","comments_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/issues/341/comments","statuses_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/statuses/fabf391c64f1fb2c9f9c88ec8ac3c2b4f144bbaf","head":{"label":"jmcameron:feature/alphabetize_translations","ref":"feature/alphabetize_translations","sha":"fabf391c64f1fb2c9f9c88ec8ac3c2b4f144bbaf","user":{"login":"jmcameron","id":62145,"avatar_url":"https://avatars.githubusercontent.com/u/62145?v=3","gravatar_id":"","url":"https://api.github.com/users/jmcameron","html_url":"https://github.com/jmcameron","followers_url":"https://api.github.com/users/jmcameron/followers","following_url":"https://api.github.com/users/jmcameron/following{/other_user}","gists_url":"https://api.github.com/users/jmcameron/gists{/gist_id}","starred_url":"https://api.github.com/users/jmcameron/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmcameron/subscriptions","organizations_url":"https://api.github.com/users/jmcameron/orgs","repos_url":"https://api.github.com/users/jmcameron/repos","events_url":"https://api.github.com/users/jmcameron/events{/privacy}","received_events_url":"https://api.github.com/users/jmcameron/received_events","type":"User","site_admin":false},"repo":{"id":27850250,"name":"bhima","full_name":"jmcameron/bhima","owner":{"login":"jmcameron","id":62145,"avatar_url":"https://avatars.githubusercontent.com/u/62145?v=3","gravatar_id":"","url":"https://api.github.com/users/jmcameron","html_url":"https://github.com/jmcameron","followers_url":"https://api.github.com/users/jmcameron/followers","following_url":"https://api.github.com/users/jmcameron/following{/other_user}","gists_url":"https://api.github.com/users/jmcameron/gists{/gist_id}","starred_url":"https://api.github.com/users/jmcameron/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmcameron/subscriptions","organizations_url":"https://api.github.com/users/jmcameron/orgs","repos_url":"https://api.github.com/users/jmcameron/repos","events_url":"https://api.github.com/users/jmcameron/events{/privacy}","received_events_url":"https://api.github.com/users/jmcameron/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jmcameron/bhima","description":"A full-featured hospital information system for developing countries.","fork":true,"url":"https://api.github.com/repos/jmcameron/bhima","forks_url":"https://api.github.com/repos/jmcameron/bhima/forks","keys_url":"https://api.github.com/repos/jmcameron/bhima/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jmcameron/bhima/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jmcameron/bhima/teams","hooks_url":"https://api.github.com/repos/jmcameron/bhima/hooks","issue_events_url":"https://api.github.com/repos/jmcameron/bhima/issues/events{/number}","events_url":"https://api.github.com/repos/jmcameron/bhima/events","assignees_url":"https://api.github.com/repos/jmcameron/bhima/assignees{/user}","branches_url":"https://api.github.com/repos/jmcameron/bhima/branches{/branch}","tags_url":"https://api.github.com/repos/jmcameron/bhima/tags","blobs_url":"https://api.github.com/repos/jmcameron/bhima/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jmcameron/bhima/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jmcameron/bhima/git/refs{/sha}","trees_url":"https://api.github.com/repos/jmcameron/bhima/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jmcameron/bhima/statuses/{sha}","languages_url":"https://api.github.com/repos/jmcameron/bhima/languages","stargazers_url":"https://api.github.com/repos/jmcameron/bhima/stargazers","contributors_url":"https://api.github.com/repos/jmcameron/bhima/contributors","subscribers_url":"https://api.github.com/repos/jmcameron/bhima/subscribers","subscription_url":"https://api.github.com/repos/jmcameron/bhima/subscription","commits_url":"https://api.github.com/repos/jmcameron/bhima/commits{/sha}","git_commits_url":"https://api.github.com/repos/jmcameron/bhima/git/commits{/sha}","comments_url":"https://api.github.com/repos/jmcameron/bhima/comments{/number}","issue_comment_url":"https://api.github.com/repos/jmcameron/bhima/issues/comments/{number}","contents_url":"https://api.github.com/repos/jmcameron/bhima/contents/{+path}","compare_url":"https://api.github.com/repos/jmcameron/bhima/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jmcameron/bhima/merges","archive_url":"https://api.github.com/repos/jmcameron/bhima/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jmcameron/bhima/downloads","issues_url":"https://api.github.com/repos/jmcameron/bhima/issues{/number}","pulls_url":"https://api.github.com/repos/jmcameron/bhima/pulls{/number}","milestones_url":"https://api.github.com/repos/jmcameron/bhima/milestones{/number}","notifications_url":"https://api.github.com/repos/jmcameron/bhima/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jmcameron/bhima/labels{/name}","releases_url":"https://api.github.com/repos/jmcameron/bhima/releases{/id}","created_at":"2014-12-11T02:27:01Z","updated_at":"2014-12-11T02:27:03Z","pushed_at":"2015-01-16T10:29:34Z","git_url":"git://github.com/jmcameron/bhima.git","ssh_url":"git@github.com:jmcameron/bhima.git","clone_url":"https://github.com/jmcameron/bhima.git","svn_url":"https://github.com/jmcameron/bhima","homepage":"","size":35043,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"IMA-WorldHealth:development","ref":"development","sha":"573fcd823a6d2c1f206b0d64ab81f28c1e7f9266","user":{"login":"IMA-WorldHealth","id":5330583,"avatar_url":"https://avatars.githubusercontent.com/u/5330583?v=3","gravatar_id":"","url":"https://api.github.com/users/IMA-WorldHealth","html_url":"https://github.com/IMA-WorldHealth","followers_url":"https://api.github.com/users/IMA-WorldHealth/followers","following_url":"https://api.github.com/users/IMA-WorldHealth/following{/other_user}","gists_url":"https://api.github.com/users/IMA-WorldHealth/gists{/gist_id}","starred_url":"https://api.github.com/users/IMA-WorldHealth/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IMA-WorldHealth/subscriptions","organizations_url":"https://api.github.com/users/IMA-WorldHealth/orgs","repos_url":"https://api.github.com/users/IMA-WorldHealth/repos","events_url":"https://api.github.com/users/IMA-WorldHealth/events{/privacy}","received_events_url":"https://api.github.com/users/IMA-WorldHealth/received_events","type":"Organization","site_admin":false},"repo":{"id":15043926,"name":"bhima","full_name":"IMA-WorldHealth/bhima","owner":{"login":"IMA-WorldHealth","id":5330583,"avatar_url":"https://avatars.githubusercontent.com/u/5330583?v=3","gravatar_id":"","url":"https://api.github.com/users/IMA-WorldHealth","html_url":"https://github.com/IMA-WorldHealth","followers_url":"https://api.github.com/users/IMA-WorldHealth/followers","following_url":"https://api.github.com/users/IMA-WorldHealth/following{/other_user}","gists_url":"https://api.github.com/users/IMA-WorldHealth/gists{/gist_id}","starred_url":"https://api.github.com/users/IMA-WorldHealth/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IMA-WorldHealth/subscriptions","organizations_url":"https://api.github.com/users/IMA-WorldHealth/orgs","repos_url":"https://api.github.com/users/IMA-WorldHealth/repos","events_url":"https://api.github.com/users/IMA-WorldHealth/events{/privacy}","received_events_url":"https://api.github.com/users/IMA-WorldHealth/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/IMA-WorldHealth/bhima","description":"A full-featured hospital information system for developing countries.","fork":false,"url":"https://api.github.com/repos/IMA-WorldHealth/bhima","forks_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/forks","keys_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/keys{/key_id}","collaborators_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/teams","hooks_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/hooks","issue_events_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/issues/events{/number}","events_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/events","assignees_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/assignees{/user}","branches_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/branches{/branch}","tags_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/tags","blobs_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/git/refs{/sha}","trees_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/git/trees{/sha}","statuses_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/statuses/{sha}","languages_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/languages","stargazers_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/stargazers","contributors_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/contributors","subscribers_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/subscribers","subscription_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/subscription","commits_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/commits{/sha}","git_commits_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/git/commits{/sha}","comments_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/comments{/number}","issue_comment_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/issues/comments/{number}","contents_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/contents/{+path}","compare_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/compare/{base}...{head}","merges_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/merges","archive_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/downloads","issues_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/issues{/number}","pulls_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/pulls{/number}","milestones_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/milestones{/number}","notifications_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/labels{/name}","releases_url":"https://api.github.com/repos/IMA-WorldHealth/bhima/releases{/id}","created_at":"2013-12-09T10:07:16Z","updated_at":"2015-01-13T16:22:15Z","pushed_at":"2015-01-16T10:46:57Z","git_url":"git://github.com/IMA-WorldHealth/bhima.git","ssh_url":"git@github.com:IMA-WorldHealth/bhima.git","clone_url":"https://github.com/IMA-WorldHealth/bhima.git","svn_url":"https://github.com/IMA-WorldHealth/bhima","homepage":"","size":37385,"stargazers_count":5,"watchers_count":5,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":7,"mirror_url":null,"open_issues_count":37,"forks":7,"open_issues":37,"watchers":5,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/IMA-WorldHealth/bhima/pulls/341"},"html":{"href":"https://github.com/IMA-WorldHealth/bhima/pull/341"},"issue":{"href":"https://api.github.com/repos/IMA-WorldHealth/bhima/issues/341"},"comments":{"href":"https://api.github.com/repos/IMA-WorldHealth/bhima/issues/341/comments"},"review_comments":{"href":"https://api.github.com/repos/IMA-WorldHealth/bhima/pulls/341/comments"},"review_comment":{"href":"https://api.github.com/repos/IMA-WorldHealth/bhima/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/IMA-WorldHealth/bhima/pulls/341/commits"},"statuses":{"href":"https://api.github.com/repos/IMA-WorldHealth/bhima/statuses/fabf391c64f1fb2c9f9c88ec8ac3c2b4f144bbaf"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"jmcameron","id":62145,"avatar_url":"https://avatars.githubusercontent.com/u/62145?v=3","gravatar_id":"","url":"https://api.github.com/users/jmcameron","html_url":"https://github.com/jmcameron","followers_url":"https://api.github.com/users/jmcameron/followers","following_url":"https://api.github.com/users/jmcameron/following{/other_user}","gists_url":"https://api.github.com/users/jmcameron/gists{/gist_id}","starred_url":"https://api.github.com/users/jmcameron/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmcameron/subscriptions","organizations_url":"https://api.github.com/users/jmcameron/orgs","repos_url":"https://api.github.com/users/jmcameron/repos","events_url":"https://api.github.com/users/jmcameron/events{/privacy}","received_events_url":"https://api.github.com/users/jmcameron/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":3,"additions":4831,"deletions":5004,"changed_files":3}}