Mercurial > pidgin
comparison libpurple/protocols/silc/chat.c @ 30432:1cdae196aac8
Standardize on "cancelled".
QuLogic: so, canceled or cancelled? that patch on #12130 is pretty thorough...
wabz: cancelled :D
wabz: that cancelled thing actually bothered me in the past
wabz: never quite enough to do such a patch :p
elb: that's an en_US vs en_GB thing
elb: both are correct, but canceled is more common in en_{US,CA} and cancelled in en_{GB,AU,NZ,etc.}
elb: personally, I use cancelled
QuLogic: yea, that's what I went for before, but I think I couldn't change any strings because we were frozen
QuLogic: you all had to pick the spelling that was opposite from the guy's patch, didn't you...
rekkanoryo: well, considering we're generally en_US in our strings, it should be canceled in our source
elb: considering they're both correct, and while I'm anal retentive, I'm not anal retentive about that, I have no preference ;-)
rekkanoryo: I don't really care either way, I just think that we should be consistently en_US or en_GB throughout
elb: right
elb: my point is, they're both correct for en_US
elb: one 'l' is simply more common
rekkanoryo: ah
rekkanoryo: if they're both technically correct for en_US, then "cancelled" is my vote
rekkanoryo: one 'l' always looks wrong to me
elb: the dictionary claims they are
Sorry, dwc.
Closes #12130.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 23 Aug 2010 01:41:31 +0000 |
parents | a538cb73f897 |
children | 9449f70762e7 |
comparison
equal
deleted
inserted
replaced
30431:c9a57878ed17 | 30432:1cdae196aac8 |
---|---|
1393 return NULL; | 1393 return NULL; |
1394 | 1394 |
1395 if (sg->roomlist) | 1395 if (sg->roomlist) |
1396 purple_roomlist_unref(sg->roomlist); | 1396 purple_roomlist_unref(sg->roomlist); |
1397 | 1397 |
1398 sg->roomlist_canceled = FALSE; | 1398 sg->roomlist_cancelled = FALSE; |
1399 | 1399 |
1400 sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc)); | 1400 sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc)); |
1401 f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE); | 1401 f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE); |
1402 fields = g_list_append(fields, f); | 1402 fields = g_list_append(fields, f); |
1403 f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_INT, | 1403 f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_INT, |
1427 | 1427 |
1428 purple_roomlist_set_in_progress(list, FALSE); | 1428 purple_roomlist_set_in_progress(list, FALSE); |
1429 if (sg->roomlist == list) { | 1429 if (sg->roomlist == list) { |
1430 purple_roomlist_unref(sg->roomlist); | 1430 purple_roomlist_unref(sg->roomlist); |
1431 sg->roomlist = NULL; | 1431 sg->roomlist = NULL; |
1432 sg->roomlist_canceled = TRUE; | 1432 sg->roomlist_cancelled = TRUE; |
1433 } | 1433 } |
1434 } | 1434 } |