kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change Old_English to English_Old - 'Old English' is actually a language

Browse source
This commit is contained in:
Nano Akron 2017-04-24 20:27:12 +01:00
parent 533187f0c3
commit 12fff108ea
No known key found for this signature in database
GPG key ID: 346A337AA2EA8B57
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mnemonics/CMakeLists.txt
View file

@ -41,7 +41,7 @@ set(mnemonics_private_headers
italian.h
japanese.h
language_base.h
old_english.h
english_old.h
portuguese.h
russian.h
singleton.h

4
src/mnemonics/electrum-words.cpp
View file

@ -61,7 +61,7 @@
#include "portuguese.h"
#include "japanese.h"
#include "russian.h"
#include "old_english.h"
#include "english_old.h"
#include "language_base.h"
#include "singleton.h"
@ -95,7 +95,7 @@ namespace
Language::Singleton<Language::Portuguese>::instance(),
Language::Singleton<Language::Japanese>::instance(),
Language::Singleton<Language::Russian>::instance(),
Language::Singleton<Language::OldEnglish>::instance()
Language::Singleton<Language::EnglishOld>::instance()
});
Language::Base *fallback = NULL;

2
src/mnemonics/electrum-words.h
View file

@ -60,7 +60,7 @@ namespace crypto
{
const int seed_length = 24;
const std::string old_language_name = "OldEnglish";
const std::string old_language_name = "EnglishOld";
/*!
* \brief Converts seed words to bytes (secret key).
* \param words String containing the words separated by spaces.

12
src/mnemonics/old_english.h → src/mnemonics/english_old.h
View file

@ -29,13 +29,13 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/*!
* \file old_english.h
* \file english_old.h
*
* \brief Old English word list and map.
* \brief Older version of English word list and map.
*/
#ifndef OLD_ENGLISH_H
#define OLD_ENGLISH_H
#ifndef ENGLISH_OLD_H
#define ENGLISH_OLD_H
#include <vector>
#include <unordered_map>
@ -48,10 +48,10 @@
*/
namespace Language
{
class OldEnglish: public Base
class EnglishOld: public Base
{
public:
OldEnglish(): Base("OldEnglish", std::vector<std::string>({
EnglishOld(): Base("EnglishOld", std::vector<std::string>({
"like",
"just",
"love",

2
tests/unit_tests/mnemonics.cpp
View file

@ -44,7 +44,7 @@
#include "mnemonics/russian.h"
#include "mnemonics/french.h"
#include "mnemonics/dutch.h"
#include "mnemonics/old_english.h"
#include "mnemonics/english_old.h"
#include "mnemonics/language_base.h"
#include "mnemonics/singleton.h"