Merge branch 'master' of github.com:Source-Python-Dev-Team/Source.Python

Author: satoon101

addons/source-python/packages/source-python/filters/players.py

@@ -94,8 +94,8 @@ def _player_is_on_team(self, player):
 # =============================================================================
 # Register the filter functions
 PlayerIter.register_filter('all', lambda player: True)
-PlayerIter.register_filter('bot', lambda player: player.is_fake_client())
-PlayerIter.register_filter('human', lambda player: not player.is_fake_client())
+PlayerIter.register_filter('bot', lambda player: player.is_bot())
+PlayerIter.register_filter('human', lambda player: not player.is_bot())
 PlayerIter.register_filter('alive', lambda player: not player.dead)
 PlayerIter.register_filter('dead', lambda player: player.dead)
 

addons/source-python/packages/source-python/players/_base.py

@@ -184,6 +184,13 @@ def is_hltv(self):
         """
         return self.playerinfo.is_hltv()
 
+    def is_bot(self):
+        """Return whether the player is a bot.
+
+        :rtype: bool
+        """
+        return self.is_fake_client() or self.steamid == 'BOT'
+
     def is_in_a_vehicle(self):
         """Return whether the player is in a vehicle.
 

addons/source-python/packages/source-python/translations/strings.py

@@ -250,11 +250,27 @@ def get_string(self, language=None, **tokens):
             # Possibly raise an error silently here
             return ''
 
-        # Update the stored tokens with the given ones
-        self.tokens.update(tokens)
+        # Expose all TranslationStrings instances in self.tokens
+        exposed_tokens = {}
+
+        # Pass additional kwargs - these will be used to format the string
+        self._update_exposed_tokens(
+            exposed_tokens, language, self.tokens, **tokens)
+
+        # Don't pass any additional kwargs, each token should either
+        # be trivial or rely on itself (self.tokens)
+        self._update_exposed_tokens(exposed_tokens, language, tokens)
 
         # Return the formatted message
-        return self[language].format(**self.tokens)
+        return self[language].format(**exposed_tokens)
+
+    @staticmethod
+    def _update_exposed_tokens(exposed_tokens, language, tokens, **kwargs):
+        for token_name, token in tokens.items():
+            if isinstance(token, TranslationStrings):
+                token = token.get_string(language, **kwargs)
+
+            exposed_tokens[token_name] = token
 
     def get_language(self, language):
         """Return the language to be used."""
@@ -291,5 +307,19 @@ def get_language(self, language):
         # Return None as the language, as no language has been found
         return None
 
+    def tokenized(self, **tokens):
+        """Create a new TranslationStrings instance and store tokens in it.
+
+        :param dict tokens: Tokens to store in the instance.
+        :return: New TranslationStrings instance with tokens stored in it.
+        :rtype: TranslationStrings
+        """
+        result = TranslationStrings()
+        result.tokens.update(tokens)
+
+        result.update(self)
+
+        return result
+
 # Get the translations language strings
 _translation_strings = LangStrings('_core/translations_strings')