Reviewing merge request #4: Add join to sugar-xx where xx is current locale, except for 'en'

If there is no default config specified. IRC Activity joins sugar channel with specific language code, selected by current locale settings. For example locale pl_PL causes to join #sugar-pl channel.

Requested by: dmp
Status: Open
Source repository: dmp-irc:channel_by_locale
Target repository: mainline:master
Created at: May 2nd, 2013 21:23

Commits that would be merged:

Version 4

Version 1
Version 2
Version 3
Version 4

3a581d4
204382c

Add join to sugar-xx where xx is current locale, except for 'en'

Showing

Showing 3a581d4-204382c

Comments
Include comments entered inline

Pushed new version 1

dmp | 2013-05-02 21:23:52 UTC

Add a check if the locale is “en” then just join #sugar instead of #sugar-en.

Aneesh Dogra | 2013-05-04 05:45:24 UTC

Pushed new version 2

dmp | 2013-05-04 21:13:11 UTC

Pushed new version 3

dmp | 2013-05-04 21:14:10 UTC

Pushed new version 4

dmp | 2013-05-04 21:15:19 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/4

# Fetch the merge request into this branch
git pull \
  git://git.sugarlabs.org/irc/mainline.git \
  refs/merge-requests/4

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/4

# To apply the changes to your branch:
git checkout master
git merge merge-requests/4
git push origin master

Reviewing merge request #4: Add join to sugar-xx where xx is current locale, except for 'en'

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline