Updated moods to version 1.2 of the XEP.

src/common/pep.py

@@ -26,40 +26,90 @@
 from common import gajim, xmpp
 
 MOODS = {
-	'afraid':			_('Afraid'),			'amazed':		_('Amazed'),
+	'afraid':			_('Afraid'),
-	'angry':				_('Angry'),				'annoyed':		_('Annoyed'),
+	'amazed':			_('Amazed'),
-	'anxious':			_('Anxious'),			'aroused':		_('Aroused'),
+	'amorous':			_('Amorous'),
-	'ashamed':			_('Ashamed'),			'bored':			_('Bored'),
+	'angry':				_('Angry'),
-	'brave':				_('Brave'),				'calm':			_('Calm'),
+	'annoyed':			_('Annoyed'),
-	'cold':				_('Cold'),				'confused':		_('Confused'),
+	'anxious':			_('Anxious'),
-	'contented':		_('Contented'),		'cranky':		_('Cranky'),
+	'aroused':			_('Aroused'),
-	'curious':			_('Curious'),			'depressed':	_('Depressed'),
+	'ashamed':			_('Ashamed'),
-	'disappointed':	_('Disappointed'),	'disgusted':	_('Disgusted'),
+	'bored':				_('Bored'),
-	'distracted':		_('Distracted'),		'embarrassed':	_('Embarrassed'),
+	'brave':				_('Brave'),
-	'excited':			_('Excited'),			'flirtatious':	_('Flirtatious'),
+	'calm':				_('Calm'),
-	'frustrated':		_('Frustrated'),		'grumpy':		_('Grumpy'),
+	'cautious':			_('Cautious'),
-	'guilty':			_('Guilty'),			'happy':			_('Happy'),
+	'cold':				_('Cold'),
-	'hot':				_('Hot'),				'humbled':		_('Humbled'),
+	'confident':		_('Confident'),
-	'humiliated':		_('Humiliated'),		'hungry':		_('Hungry'),
+	'confused':			_('Confused'),
-	'hurt':				_('Hurt'),				'impressed':	_('Impressed'),
+	'contemplative':	_('Contemplative'),
-	'in_awe':			_('In Awe'),			'in_love':		_('In Love'),
+	'contented':		_('Contented'),
-	'indignant':		_('Indignant'),		'interested':	_('Interested'),
+	'cranky':			_('Cranky'),
-	'intoxicated':		_('Intoxicated'),		'invincible':	_('Invincible'),
+	'crazy':				_('Crazy'),
-	'jealous':			_('Jealous'),			'lonely':		_('Lonely'),
+	'creative':			_('Creative'),
-	'mean':				_('Mean'),				'moody':			_('Moody'),
+	'curious':			_('Curious'),
-	'nervous':			_('Nervous'),			'neutral':		_('Neutral'),
+	'dejected':			_('Dejected'),
-	'offended':			_('Offended'),			'playful':		_('Playful'),
+	'depressed':		_('Depressed'),
-	'proud':				_('Proud'),				'relieved':		_('Relieved'),
+	'disappointed':	_('Disappointed'),
-	'remorseful':		_('Remorseful'),		'restless':		_('Restless'),
+	'disgusted':		_('Disgusted'),
-	'sad':				_('Sad'),				'sarcastic':	_('Sarcastic'),
+	'dismayed':			_('Dismayed'),
-	'serious':			_('Serious'),			'shocked':		_('Shocked'),
+	'distracted':		_('Distracted'),
-	'shy':				_('Shy'),				'sick':			_('Sick'),
+	'embarrassed':		_('Embarrassed'),
-	'sleepy':			_('Sleepy'),			'stressed':		_('Stressed'),
+	'envious':			_('Envious'),
-	'surprised':		_('Surprised'),		'thirsty':		_('Thirsty'),
+	'excited':			_('Excited'),
-	'thoughtful':		_('Thoughtful'),		'worried':		_('Worried')}
+	'flirtatious':		_('Flirtatious'),
-
+	'frustrated':		_('Frustrated'),
-# These moods are only available in the Gajim namespace
+	'grateful':			_('Grateful'),
-GAJIM_MOODS = ['thoughtful']
+	'grieving':			_('Grieving'),
+	'grumpy':			_('Grumpy'),
+	'guilty':			_('Guilty'),
+	'happy':				_('Happy'),
+	'hopeful':			_('Hopeful'),
+	'hot':				_('Hot'),
+	'humbled':			_('Humbled'),
+	'humiliated':		_('Humiliated'),
+	'hungry':			_('Hungry'),
+	'hurt':				_('Hurt'),
+	'impressed':		_('Impressed'),
+	'in_awe':			_('In_awe'),
+	'in_love':			_('In_love'),
+	'indignant':		_('Indignant'),
+	'interested':		_('Interested'),
+	'intoxicated':		_('Intoxicated'),
+	'invincible':		_('Invincible'),
+	'jealous':			_('Jealous'),
+	'lonely':			_('Lonely'),
+	'lost':				_('Lost'),
+	'lucky':				_('Lucky'),
+	'mean':				_('Mean'),
+	'moody':				_('Moody'),
+	'nervous':			_('Nervous'),
+	'neutral':			_('Neutral'),
+	'offended':			_('Offended'),
+	'outraged':			_('Outraged'),
+	'playful':			_('Playful'),
+	'proud':				_('Proud'),
+	'relaxed':			_('Relaxed'),
+	'relieved':			_('Relieved'),
+	'remorseful':		_('Remorseful'),
+	'restless':			_('Restless'),
+	'sad':				_('Sad'),
+	'sarcastic':		_('Sarcastic'),
+	'satisfied':		_('Satisfied'),
+	'serious':			_('Serious'),
+	'shocked':			_('Shocked'),
+	'shy':				_('Shy'),
+	'sick':				_('Sick'),
+	'sleepy':			_('Sleepy'),
+	'spontaneous':		_('Spontaneous'),
+	'stressed':			_('Stressed'),
+	'strong':			_('Strong'),
+	'surprised':		_('Surprised'),
+	'thankful':			_('Thankful'),
+	'thirsty':			_('Thirsty'),
+	'tired':				_('Tired'),
+	'undefined':		_('Undefined'),
+	'weak':				_('Weak'),
+	'worried':			_('Worried')}
 
 ACTIVITIES = {
 	'doing_chores': {'category':			_('Doing Chores'),
@@ -418,11 +468,7 @@ def user_send_mood(account, mood, message = ''):
 		return
 	item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD})
 	if mood != '':
-		if mood in GAJIM_MOODS:
+		item.addChild(mood)
-			ns = 'http://gajim.org/moods'
-		else:
-			ns = None
-		item.addChild(mood, namespace = ns)
 	if message != '':
 		i = item.addChild('text')
 		i.addData(message)