Fork Clansuite on GitHub

Internet Relay Chat - Logs for #koch
Collected by k-logbot on chat.freenode.net

IRC Log for Dienstag, 14. August 2012

  1. 1: [0:01] -jubii2.dk.quakenet.org- on 3 ca 1(4) ft 20(20) tr
  2. 2: [0:01] * cslogbot (~PircBot@server.jakoch.de) has joined #clansuite
  3. 3: [0:01] * Topic is '"Welcome! http://clansuite.com | http://www.youtube.com/watch?v=JPqFNQCXF9Y | https://travis-ci.org/#!/jakoch/Clansuite "'
  4. 4: [0:01] * Set by Q on Tue Aug 07 19:09:33 CEST 2012
  5. 5: [6:02] <BlueBox> moin
  6. 6: [9:43] * SyNko (~chatzilla@81.174.23.229) has joined #clansuite
  7. 7: [10:44] <jakoch> hey
  8. 8: [10:59] * CIA-1 (~CIA@204.152.223.100) Quit (G-lined)
  9. 9: [11:18] <SyNko> hi jakoch
  10. 10: [11:18] <SyNko> i've done the translation file
  11. 11: [11:18] <SyNko> now i try to push it
  12. 12: [11:19] <SyNko> so we seems if it works
  13. 13: [11:19] <SyNko> *see
  14. 14: [11:20] <jakoch> nice!
  15. 15: [11:27] <SyNko> $ git push
  16. 16: [11:27] <SyNko> fatal: The remote end hung up unexpectedly
  17. 17: [11:28] <jakoch> did you load your ssh key?
  18. 18: [11:28] <SyNko> and a popup shows" Disconnected: No supported authentication methods available (server sent: publickey)
  19. 19: [11:28] <SyNko> from the agent?
  20. 20: [11:29] <jakoch> yes
  21. 21: [11:29] <SyNko> done! :D
  22. 22: [11:29] <jakoch> :)
  23. 23: [11:31] <jakoch> oh cool, you figured out how to merge remote-tracking branch
  24. 24: [11:32] <jakoch> very good!!
  25. 25: [11:32] <SyNko> thanks man, im applying to this work with focus sometimes...
  26. 26: [11:33] <jakoch> and now look at that: https://github.com/SyNko/Clansuite/commit/36fcedc3e1b45bb5d51c392bee6c17b0c5dd99f8
  27. 27: [11:34] <SyNko> it's my work
  28. 28: [11:34] <SyNko> wow!
  29. 29: [11:35] <SyNko> there is a mistake
  30. 30: [11:35] <jakoch> looks like italian :) i need to test the installer with it and see how that looks
  31. 31: [11:35] <SyNko> on the class declaration
  32. 32: [11:35] <SyNko> English > Italian
  33. 33: [11:35] <SyNko> correct please
  34. 34: [11:35] * CIA-1 (~CIA@204.152.223.100) has joined #clansuite
  35. 35: [11:36] <jakoch> yes, L36
  36. 36: [11:36] <SyNko> yep and 30
  37. 37: [11:38] <jakoch> you might still fix it before sending a pull request
  38. 38: [11:39] <SyNko> yes, i know
  39. 39: [11:40] <SyNko> but i ve already do that
  40. 40: [11:41] <SyNko> i don't know how can do it now
  41. 41: [11:42] <jakoch> you mean: how to do the pull request?
  42. 42: [11:42] <SyNko> nope change a pull already sent
  43. 43: [11:43] <jakoch> you didn't send a pull, yet .. there are 0 open requests in the main repository
  44. 44: [11:43] <SyNko> ah
  45. 45: [11:43] <SyNko> so just in my fork?
  46. 46: [11:44] <jakoch> yes, you pushed your changes to your fork
  47. 47: [11:44] <SyNko> and the upstream thing? which is its use?
  48. 48: [11:45] <jakoch> to stay synchronized with latest developments of the main repo
  49. 49: [11:45] <jakoch> you forked at a certain time, from there on your fork and the main repository life on their own
  50. 50: [11:46] <SyNko> git fetch upstream-develop
  51. 51: [11:46] <SyNko> git merge upstream-develop/develop
  52. 52: [11:46] <jakoch> yes, that fetches and then merges all the latest stuff from the main repo to yours
  53. 53: [11:46] <SyNko> but it will keep the new file?
  54. 54: [11:47] <jakoch> yes
  55. 55: [11:48] <jakoch> https://github.com/SyNko/Clansuite/commits/develop/
  56. 56: [11:48] <jakoch> "Merge remote-tracking branch 'upstream-develop/develop' into develop"
  57. 57: [11:49] <jakoch> this is the result of the two commands above
  58. 58: [11:49] <SyNko> done
  59. 59: [11:49] <SyNko> repushed
  60. 60: [11:50] <jakoch> https://github.com/SyNko/Clansuite/commit/aceb11562088c4e8546e8de334b439847624b8d8
  61. 61: [11:50] <SyNko> but i cannot pust to the main develope clansuite repo, i think is right
  62. 62: [11:50] <jakoch> yes, now it's fixed
  63. 63: [11:51] <jakoch> yes, it's right, you can fetch from the main development repo, but not push directly to it
  64. 64: [11:52] <jakoch> and i can not push to your repo directly
  65. 65: [11:52] <SyNko> ok
  66. 66: [11:52] <jakoch> now the next step is to open a pull request in the github webinterface
  67. 67: [11:53] <jakoch> you did that before: https://github.com/Clansuite/Clansuite/pull/2
  68. 68: [11:53] <jakoch> you remember?
  69. 69: [11:53] <SyNko> ah yes
  70. 70: [11:53] <SyNko> is only possible from the web?
  71. 71: [11:54] <jakoch> i have to say yes, because i do not know any other way
  72. 72: [11:54] * CIA-1 (~CIA@204.152.223.100) Quit (Read error: Operation timed out)
  73. 73: [11:55] <SyNko> done
  74. 74: [11:56] <SyNko> do you see something?
  75. 75: [11:56] <jakoch> 1 open request
  76. 76: [11:56] <SyNko> k
  77. 77: [11:56] <jakoch> https://github.com/Clansuite/Clansuite/pull/3
  78. 78: [11:57] <jakoch> now you are proposing all these commits
  79. 79: [11:57] <SyNko> k
  80. 80: [12:00] <jakoch> ok: https://github.com/Clansuite/Clansuite/pull/3
  81. 81: [12:00] <jakoch> its merged
  82. 82: [12:04] <SyNko> $so i need this again? [11:46] SyNko git fetch upstream-develop
  83. 83: [12:04] <SyNko> [11:46] SyNko git merge upstream-develop/develop
  84. 84: [12:06] <jakoch> i merged your changes, so we are pretty much at the same repository state at the moment
  85. 85: [12:06] <jakoch> but you might still use the commands, it will say "alreay up-to-date" or something
  86. 86: [12:08] <SyNko> $ git fetch upstream-develop
  87. 87: [12:08] <SyNko> remote: Counting objects: 1, done.
  88. 88: [12:08] <SyNko> remote: Total 1 (delta 0), reused 1 (delta 0)
  89. 89: [12:08] <SyNko> Unpacking objects: 100% (1/1), done.
  90. 90: [12:08] <SyNko> From git://github.com/Clansuite/Clansuite
  91. 91: [12:08] <SyNko> 7f19dc7..f91b76c develop -> upstream-develop/develop
  92. 92: [12:08] <SyNko> SyNko@GHOST /C/Users/SyNko/Desktop/__LanSuite/Clansuite (develop)
  93. 93: [12:08] <SyNko> $ git merge upstream-develop/develop
  94. 94: [12:08] <SyNko> Updating aceb115..f91b76c
  95. 95: [12:08] <SyNko> Fast-forward
  96. 96: [12:11] <jakoch> yes, looks ok.. both repositories are now at commit 'f91b76c'
  97. 97: [12:12] <SyNko> k
  98. 98: [12:12] <jakoch> Fast-forward means that the merge command has nothing to do on your repository
  99. 99: [12:13] <SyNko> ok cool
  100. 100: [12:13] <jakoch> because all the changes are already there, so merge skipped (fast-forwarded) some commits and just updated the commit number
  101. 101: [12:14] * CIA-1 (~CIA@204.152.223.100) has joined #clansuite
  102. 102: [12:16] <SyNko> which clan game do you like?
  103. 103: [12:17] <jakoch> our team used to play counter-strike for a long time, but also had some guys playing dota and wow
  104. 104: [12:18] <SyNko> i play always t:a
  105. 105: [12:18] <SyNko> like now
  106. 106: [12:20] <jakoch> ah..sci-fi shooter, right?
  107. 107: [12:20] <SyNko> yeha
  108. 108: [12:21] <jakoch> that game remembers me of a level called "two towers" and a "teleport" and "rocket jumps" :)
  109. 109: [12:22] <jakoch> i forgot the name of the game
  110. 110: [12:26] <jakoch> UT "unreal tournament"
  111. 111: [12:26] <jakoch> had it on my tongue :)
  112. 112: [12:30] <jakoch> ok.. now: to get the translation running in the installation, we need to put a "italian.gif" image in the languages folder
  113. 113: [12:32] <SyNko> do you already got the italy flag?
  114. 114: [12:37] <jakoch> yes, it's in the countries icon set, but i wonder why i didn't use that in the installation
  115. 115: [12:38] <jakoch> i used images 23px x 12px there..
  116. 116: [12:38] <SyNko> so resize with the gimp
  117. 117: [12:49] <CIA-1> Clansuite: New Commit: Revision #[bcaaebb] by jakoch
  118. 118: [12:49] <CIA-1> Clansuite: File(s): Clansuite/ (7 files in 2 dirs)
  119. 119: [12:49] <CIA-1> Clansuite: Comment: updated language icons and added italian, so this activates italian language, too - http://git.io/fTVxLg
  120. 120: [12:49] <CIA-1> Clansuite: View (delayed): http://trac.clansuite.com/changeset/bcaaebb
  121. 121: [12:52] <jakoch> look like this: http://i.imgur.com/CIABi.png
  122. 122: [12:53] <jakoch> the dropdown shows the flags (but that will not work in every browser)
  123. 123: [12:53] <jakoch> the picture is taken in firefox
  124. 124: [12:59] <jakoch> there are also some utf-8 problem (guider�).. we need to apply utf-8 encoding on the language items, like for german language umlauts
  125. 125: [13:00] <CIA-1> Clansuite: New Commit: Revision #[0199d4d] by jakoch
  126. 126: [13:00] <CIA-1> Clansuite: File(s): Clansuite/ Installation/Languages/italian.install.php
  127. 127: [13:00] <CIA-1> Clansuite: Comment: utf-8 encoding fix for italian language - http://git.io/M-hmNw
  128. 128: [13:00] <CIA-1> Clansuite: View (delayed): http://trac.clansuite.com/changeset/0199d4d
  129. 129: [13:01] <jakoch> ok, that solved it: http://i.imgur.com/s1xZL.png
  130. 130: [13:05] <SyNko> ok
  131. 131: [13:09] <SyNko> Why not utf8 all language files encoding? is simplier
  132. 132: [13:12] <jakoch> thats true
  133. 133: [13:12] <jakoch> so, if we skip utf8-encode() command then all language items have to be in utf-8 already
  134. 134: [13:13] <jakoch> so you need to write stuff like &amp; etc in the language file to get the correct chars
  135. 135: [13:14] <jakoch> or we take the offset* commands() from each language class and move it into an abstract base class for all language classes
  136. 136: [13:15] <jakoch> then utf8-encode is applied every time
  137. 137: [13:15] <SyNko> nope
  138. 138: [13:15] <SyNko> if you put the charset in the html head of utf8 and encode all the pages in utf8 the work is done
  139. 139: [13:16] <SyNko> at leat the template html page
  140. 140: [13:16] <jakoch> we have <meta charset="utf-8">
  141. 141: [13:16] <SyNko> and the traslation files
  142. 142: [13:16] <SyNko> so where is the problem? encode the file in uft8 from the files property
  143. 143: [13:17] <SyNko> i made a mintake with something
  144. 144: [13:17] <SyNko> *mistake
  145. 145: [13:17] <jakoch> the utf-8 fix does this: http://trac.clansuite.com/changeset/0199d4d
  146. 146: [13:17] <SyNko> i mod only one file and now says that 288 files are in the commit
  147. 147: [13:18] <jakoch> hmm
  148. 148: [13:18] <SyNko> i mean without the function that encode if you change the encoding of the file only it works the same
  149. 149: [13:19] <SyNko> the error it's because i made a ftp download to get the mod in the local repo
  150. 150: [13:22] <jakoch> hmm, so you mean we save the files as utf-8 and remove utf8_encode()
  151. 151: [13:22] <SyNko> let's try is better
  152. 152: [13:22] <SyNko> ive a utf 8 converter
  153. 153: [13:22] <SyNko> but most of programmer's notepad have it
  154. 154: [13:27] <CIA-1> Clansuite: New Commit: Revision #[fc8a909] by jakoch
  155. 155: [13:27] <CIA-1> Clansuite: File(s): Clansuite/ (3 files)
  156. 156: [13:27] <CIA-1> Clansuite: Comment: converted language files to UTF-8 encoding and removed usage of utf8_encode() - http://git.io/F36t0Q
  157. 157: [13:27] <CIA-1> Clansuite: View (delayed): http://trac.clansuite.com/changeset/fc8a909
  158. 158: [13:27] <jakoch> ok that seems to work
  159. 159: [13:28] <SyNko> k, well
  160. 160: [13:28] <jakoch> good idea
  161. 161: [13:29] <SyNko> tnx
  162. 162: [13:29] <jakoch> i break off for lunch now, brb 1h
  163. 163: [13:47] * Rikku`on (~Daniel@78.55.97.25) has joined #clansuite
  164. 164: [14:22] <jakoch> re
  165. 165: [14:23] <jakoch> Rikku`on: have you seen this already? http://i.imgur.com/s1xZL.png installation is in italian now :)
  166. 166: [14:33] <Rikku`on> beautiful :D
  167. 167: [14:33] <Rikku`on> the only word i know is: Avanti !!!
  168. 168: [14:49] <CIA-1> Clansuite: New Commit: Revision #[56610a3] by jakoch
  169. 169: [14:49] <CIA-1> Clansuite: File(s): Clansuite/ Installation/Application/Application.php
  170. 170: [14:49] <CIA-1> Clansuite: Comment: let the autoloader handle the language files; (+7 more commits...) - http://git.io/KXvTiA
  171. 171: [14:49] <CIA-1> Clansuite: View (delayed): http://trac.clansuite.com/changeset/56610a3
  172. 172: [15:30] * Rikku`on (~Daniel@78.55.97.25) Quit (Quit: Leaving.)
  173. 173: [15:52] * CIA-1 (~CIA@204.152.223.100) Quit (Ping timeout)
  174. 174: [16:44] * CIA-1 (~CIA@204.152.223.100) has joined #clansuite
  175. 175: [20:44] * wpnxm-bot (~wpnxm-bot@sh3.rs.github.com) has joined #clansuite
  176. 176: [20:44] <wpnxm-bot> [WPN-XM] jakoch pushed 1 new commit to develop: http://git.io/T9PMmA
  177. 177: [20:44] <wpnxm-bot> [WPN-XM/develop] changed innosetup directives - jakoch
  178. 178: [20:44] * wpnxm-bot (~wpnxm-bot@sh3.rs.github.com) has left #clansuite
  179. 179: [20:46] * Rikku`on (~Daniel@78.55.97.25) has joined #clansuite
  180. 180: [21:25] * Rikku`on (~Daniel@78.55.97.25) Quit (Quit: Leaving.)
  181. 181: [23:13] * Rikku`on (~Daniel@78.55.97.25) has joined #clansuite
  182. 182: [23:22] * Rikku`on (~Daniel@78.55.97.25) Quit (Quit: Leaving.)

Links of Dienstag, 14. August 2012

1) http://git.io/T9PMmA
2) http://trac.clansuite.com/changeset/56610a3
3) http://git.io/KXvTiA
4) http://i.imgur.com/s1xZL.png
5) http://trac.clansuite.com/changeset/fc8a909
6) http://git.io/F36t0Q
7) http://trac.clansuite.com/changeset/0199d4d
8) http://git.io/M-hmNw
9) http://i.imgur.com/CIABi.png
10) http://trac.clansuite.com/changeset/bcaaebb
11) http://git.io/fTVxLg
12) https://github.com/Clansuite/Clansuite/pull/3
13) https://github.com/Clansuite/Clansuite/pull/2
14) https://github.com/SyNko/Clansuite/commit/aceb11562088c4e8546e8de334b439847624b8d8
15) https://github.com/SyNko/Clansuite/commits/develop/
16) https://github.com/SyNko/Clansuite/commit/36fcedc3e1b45bb5d51c392bee6c17b0c5dd99f8
17) http://clansuite.com
18) http://www.youtube.com/watch?v=JPqFNQCXF9Y
19) https://travis-ci.org/#!/jakoch/Clansuite

These logs were automatically created by k-logbot on chat.freenode.net using the Clansuite IRC LogBot. Find the project at Github.