extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-06-25 06:24:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from rfjakob/next

Browse Source 
Update yes/no prompts. Fixes issue #20
This commit is contained in:
Valient Gough 2014-12-13 19:22:15 -08:00
commit 3643924ba3
2 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README-NLS
View File

@ -60,11 +60,12 @@ to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
Translating
===========
EncFS is registered with Rosetta - an online interface for supplying
translations. See https://launchpad.ubuntu.com/rosetta/products/encfs
EncFS is registered with Launchpad Translations - an online interface
for supplying translations.
See https://translations.launchpad.net/encfs/main/+pots/encfs
If your language is not included in this distribution, you may want
to check if translated text is already available online in Rosetta.
to check if translated text is already available online in Launchpad.
If not, consider translating some of the strings, which will then be
included in the next EncFS release.

65
encfs/FileUtils.cpp
View File

@ -805,19 +805,51 @@ static int selectBlockSize(const Cipher::CipherAlgorithm &alg) {
return blockSize;
}
static bool boolDefaultNo(const char *prompt) {
cout << prompt << "\n";
cout << _("The default here is No.\n"
"Any response that does not begin with 'y' will mean No: ");
/**
* Prompt the user for a "y" or "n" answer.
* An empty answer returns defaultValue.
*/
static bool boolDefault(const char *prompt, bool defaultValue) {
char answer[10];
char *res = fgets(answer, sizeof(answer), stdin);
cout << prompt;
cout << "\n";
if (res != 0 && tolower(answer[0]) == 'y')
return true;
string yesno;
if (defaultValue == true)
yesno = "[y]/n: ";
else
return false;
yesno = "y/[n]: ";
string response;
bool value;
while(true) {
cout << yesno;
getline(cin, response);
if (cin.fail() || response == "") {
value = defaultValue;
break;
} else if (response == "y") {
value = true;
break;
} else if (response == "n") {
value = false;
break;
}
}
cout << "\n";
return value;
}
static bool boolDefaultNo(const char *prompt) {
return boolDefault(prompt, false);
}
static bool boolDefaultYes(const char *prompt) {
return boolDefault(prompt, true);
}
/**
@ -858,21 +890,6 @@ static void selectBlockMAC(int *macBytes, int *macRandBytes) {
*macRandBytes = randSize;
}
static bool boolDefaultYes(const char *prompt) {
cout << prompt << "\n";
cout << _("The default here is Yes.\n"
"Any response that does not begin with 'n' will mean Yes: ");
char answer[10];
char *res = fgets(answer, sizeof(answer), stdin);
cout << "\n";
if (res != 0 && tolower(answer[0]) == 'n')
return false;
else
return true;
}
/**
* Ask the user if per-file unique IVs should be used
*/