Browse Source

Travis CI: API documentation update at 2019-02-16 13:12:26 UTC.
[ci package]

Commit: https://github.com/urho3d/Urho3D/commit/d4cf8a9f05f42a8bdd24360f9db03a2bdd8889a0

Message: localization JSON file now supports simple key-value structure (#2359)

* localization JSON file now supports simple key-value structure

* docs updated, code refactoring

* minor fix

* AngelScript integration fixed

urho3d-travis-ci 6 years ago
parent
commit
8fe943568e
4 changed files with 11 additions and 7 deletions
  1. 3 2
      Docs/AngelScriptAPI.h
  2. 4 2
      Docs/LuaScriptAPI.dox
  3. 3 2
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Urho3D/.soversion

+ 3 - 2
Docs/AngelScriptAPI.h

@@ -6830,8 +6830,9 @@ String GetLanguage(int);
 int GetLanguageIndex(const String&);
 int GetLanguageIndex(const String&);
 bool HasSubscribedToEvent(Object, const String&);
 bool HasSubscribedToEvent(Object, const String&);
 bool HasSubscribedToEvent(const String&);
 bool HasSubscribedToEvent(const String&);
-void LoadJSON(const JSONValue&);
-void LoadJSONFile(const String&);
+void LoadJSONFile(const String&, const String = String ( "" ) const);
+void LoadMultipleLanguageJSON(const JSONValue&);
+void LoadSingleLanguageJSON(const JSONValue&, const String& = String ( "" ) const);
 void Reset();
 void Reset();
 void SendEvent(const String&, VariantMap& = VariantMap ( ));
 void SendEvent(const String&, VariantMap& = VariantMap ( ));
 void SetLanguage(const String&);
 void SetLanguage(const String&);

+ 4 - 2
Docs/LuaScriptAPI.dox

@@ -3425,8 +3425,10 @@ Methods:
 - void SetLanguage(int index)
 - void SetLanguage(int index)
 - String Get(const String id)
 - String Get(const String id)
 - void Reset()
 - void Reset()
-- void LoadJSON(const JSONValue& source)
-- void LoadJSONFile(const String name)
+- void LoadMultipleLanguageJSON(const JSONValue& source)
+- void LoadSingleLanguageJSON(const JSONValue& source)
+- void LoadSingleLanguageJSON(const JSONValue& source, const String language)
+- void LoadJSONFile(const String name, const String language = String::EMPTY)
 
 
 Properties:
 Properties:
 
 

+ 3 - 2
Docs/ScriptAPI.dox

@@ -8754,8 +8754,9 @@ Methods:
 - int GetLanguageIndex(const String&)
 - int GetLanguageIndex(const String&)
 - bool HasSubscribedToEvent(Object@, const String&)
 - bool HasSubscribedToEvent(Object@, const String&)
 - bool HasSubscribedToEvent(const String&)
 - bool HasSubscribedToEvent(const String&)
-- void LoadJSON(const JSONValue&)
-- void LoadJSONFile(const String&)
+- void LoadJSONFile(const String&, const String = String ( "" ) const)
+- void LoadMultipleLanguageJSON(const JSONValue&)
+- void LoadSingleLanguageJSON(const JSONValue&, const String& = String ( "" ) const)
 - void Reset()
 - void Reset()
 - void SendEvent(const String&, VariantMap& = VariantMap ( ))
 - void SendEvent(const String&, VariantMap& = VariantMap ( ))
 - void SetLanguage(const String&)
 - void SetLanguage(const String&)

+ 1 - 1
Source/Urho3D/.soversion

@@ -1 +1 @@
-0.1.119
+0.1.120