[haiku-commits] haiku: hrev53499 - in src/apps/haikudepot: ui server

  • From: humdinger <humdingerb@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 20 Sep 2019 12:59:03 -0400 (EDT)

hrev53499 adds 1 changeset to branch 'master'
old head: 4679af2788a14265fee1189a1473225039ff21f4
new head: 1448ced00b00ea52cce591695c483f9092cd3ad6
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=1448ced00b00+%5E4679af2788a1

----------------------------------------------------------------------------

1448ced00b00: HaikuDepot: sentence casing notification titles
  
  * We generally use sentence casing, even for alerts and notification
    titles
  
  * Using "User usage conditions" uses a bit too many 'users' for my
    taste. How about dropping the "User" and distinguish possible future
    additions with e.g. "Developer usage conditions"?
  
  Change-Id: Iff2473ec193515b960d3da45bbd590c95413f99f
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/1869
  Reviewed-by: Andrew Lindesay <apl@xxxxxxxxxxxxxx>

                                        [ Humdinger <humdingerb@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev53499
Commit:      1448ced00b00ea52cce591695c483f9092cd3ad6
URL:         https://git.haiku-os.org/haiku/commit/?id=1448ced00b00
Author:      Humdinger <humdingerb@xxxxxxxxx>
Date:        Wed Sep 18 15:16:44 2019 UTC
Committer:   humdinger <humdingerb@xxxxxxxxx>
Commit-Date: Fri Sep 20 16:58:57 2019 UTC

----------------------------------------------------------------------------

5 files changed, 24 insertions(+), 24 deletions(-)
.../server/LocalPkgDataLoadProcess.cpp           |  2 +-
.../server/LocalRepositoryUpdateProcess.cpp      |  2 +-
src/apps/haikudepot/ui/MainWindow.cpp            |  4 ++--
src/apps/haikudepot/ui/UserLoginWindow.cpp       | 22 ++++++++++----------
.../haikudepot/ui/UserUsageConditionsWindow.cpp  | 18 ++++++++--------

----------------------------------------------------------------------------

diff --git a/src/apps/haikudepot/server/LocalPkgDataLoadProcess.cpp 
b/src/apps/haikudepot/server/LocalPkgDataLoadProcess.cpp
index e9b0d3fba8..878e12f89a 100644
--- a/src/apps/haikudepot/server/LocalPkgDataLoadProcess.cpp
+++ b/src/apps/haikudepot/server/LocalPkgDataLoadProcess.cpp
@@ -388,6 +388,6 @@ LocalPkgDataLoadProcess::_NotifyError(const BString& 
messageText) const
        printf("an error has arisen loading data of packages from local : %s\n",
                messageText.String());
        AppUtils::NotifySimpleError(
-               B_TRANSLATE("Local Repository Load Error"),
+               B_TRANSLATE("Local repository load error"),
                messageText);
 }
\ No newline at end of file
diff --git a/src/apps/haikudepot/server/LocalRepositoryUpdateProcess.cpp 
b/src/apps/haikudepot/server/LocalRepositoryUpdateProcess.cpp
index c0bfb5128f..1c03ae90f6 100644
--- a/src/apps/haikudepot/server/LocalRepositoryUpdateProcess.cpp
+++ b/src/apps/haikudepot/server/LocalRepositoryUpdateProcess.cpp
@@ -151,6 +151,6 @@ LocalRepositoryUpdateProcess::_NotifyError(const BString& 
error,
        }
 
        AppUtils::NotifySimpleError(
-               B_TRANSLATE("Repository Update Error"),
+               B_TRANSLATE("Repository update error"),
                alertText);
 }
\ No newline at end of file
diff --git a/src/apps/haikudepot/ui/MainWindow.cpp 
b/src/apps/haikudepot/ui/MainWindow.cpp
index 5d9adf9c6e..caa23af602 100644
--- a/src/apps/haikudepot/ui/MainWindow.cpp
+++ b/src/apps/haikudepot/ui/MainWindow.cpp
@@ -740,7 +740,7 @@ MainWindow::_BuildUserMenu(BMenuBar* menuBar)
        fUserMenu->AddItem(fLogOutItem);
 
        BMenuItem *latestUserUsageConditionsMenuItem =
-               new BMenuItem(B_TRANSLATE("View latest user usage conditions"
+               new BMenuItem(B_TRANSLATE("View latest usage conditions"
                        B_UTF8_ELLIPSIS),
                        new BMessage(MSG_VIEW_LATEST_USER_USAGE_CONDITIONS));
        fUserMenu->AddItem(latestUserUsageConditionsMenuItem);
@@ -954,7 +954,7 @@ MainWindow::_BulkLoadProcessCoordinatorFinished(
 {
        if (coordinatorState.ErrorStatus() != B_OK) {
                AppUtils::NotifySimpleError(
-                       B_TRANSLATE("Package Update Error"),
+                       B_TRANSLATE("Package update error"),
                        B_TRANSLATE("While updating package data, a problem has 
arisen "
                                "that may cause data to be outdated or missing 
from the "
                                "application's display. Additional details 
regarding this "
diff --git a/src/apps/haikudepot/ui/UserLoginWindow.cpp 
b/src/apps/haikudepot/ui/UserLoginWindow.cpp
index b28cfffc21..13164f3856 100644
--- a/src/apps/haikudepot/ui/UserLoginWindow.cpp
+++ b/src/apps/haikudepot/ui/UserLoginWindow.cpp
@@ -128,11 +128,11 @@ UserLoginWindow::UserLoginWindow(BWindow* parent, BRect 
frame, Model& model)
                NULL);
        fConfirmMinimumAgeCheckBox->SetEnabled(false);
        fConfirmUserUsageConditionsCheckBox = new BCheckBox(
-               "confirm user usage conditions",
-               B_TRANSLATE("I agree to the usage conditions for users"),
+               "confirm usage conditions",
+               B_TRANSLATE("I agree to the usage conditions"),
                NULL);
-       fUserUsageConditionsLink = new LinkView("user usage conditions view",
-               B_TRANSLATE("View the usage conditions for users"),
+       fUserUsageConditionsLink = new LinkView("usage conditions view",
+               B_TRANSLATE("View the usage conditions"),
                new BMessage(MSG_VIEW_LATEST_USER_USAGE_CONDITIONS));
        fUserUsageConditionsLink->SetTarget(this);
 
@@ -419,7 +419,7 @@ UserLoginWindow::_ValidateCreateAccountFields(bool 
alertProblems)
 
                if (!userUsageConditionsConfirmed) {
                        message << B_TRANSLATE(
-                               "The usage conditions for users must be agreed 
to.") << "\n\n";
+                               "The usage conditions must be agreed to.") << 
"\n\n";
                }
 
                BAlert* alert = new(std::nothrow) BAlert(
@@ -596,9 +596,9 @@ 
UserLoginWindow::_CreateAccountUserUsageConditionsSetupThread()
                BMessenger(this).SendMessage(&dataMessage);
        } else {
                AppUtils::NotifySimpleError(
-                       B_TRANSLATE("User Usage Conditions Download Problem"),
-                       B_TRANSLATE("An error has arisen downloading the user 
usage "
-                               "conditions.  Check the log for details and try 
again."));
+                       B_TRANSLATE("Usage conditions download problem"),
+                       B_TRANSLATE("An error has arisen downloading the usage "
+                               "conditions. Check the log for details and try 
again."));
                BMessenger(this).SendMessage(B_QUIT_REQUESTED);
        }
 }
@@ -759,11 +759,11 @@ UserLoginWindow::_CreateAccountThread()
                return;
 
        if (fUserUsageConditions == NULL)
-               debugger("missing user usage conditions when creating an 
account");
+               debugger("missing usage conditions when creating an account");
 
        if (fConfirmMinimumAgeCheckBox->Value() == 0
                || fConfirmUserUsageConditionsCheckBox->Value() == 0) {
-               debugger("expected that the minimum age and user usage 
conditions are"
+               debugger("expected that the minimum age and usage conditions 
are "
                        "agreed to at this point");
        }
 
@@ -903,7 +903,7 @@ void
 UserLoginWindow::_ViewUserUsageConditions()
 {
        if (fUserUsageConditions == NULL)
-               debugger("the user usage conditions should be set");
+               debugger("the usage conditions should be set");
        UserUsageConditionsWindow* window = new UserUsageConditionsWindow(
                fModel, *fUserUsageConditions);
        window->Show();
diff --git a/src/apps/haikudepot/ui/UserUsageConditionsWindow.cpp 
b/src/apps/haikudepot/ui/UserUsageConditionsWindow.cpp
index 88853da2d1..ced074ed01 100644
--- a/src/apps/haikudepot/ui/UserUsageConditionsWindow.cpp
+++ b/src/apps/haikudepot/ui/UserUsageConditionsWindow.cpp
@@ -29,11 +29,11 @@
 #define PLACEHOLDER_TEXT "..."
 
 #define INTRODUCTION_TEXT_LATEST "HaikuDepot communicates with a " \
-       "sever component called HaikuDepotServer.  These are the latest user " \
+       "sever component called HaikuDepotServer.  These are the latest " \
        "usage conditions for use of the HaikuDepotServer service."
 
 #define INTRODUCTION_TEXT_USER "HaikuDepot communicates with a " \
-       "sever component called HaikuDepotServer.  These are the user usage " \
+       "sever component called HaikuDepotServer.  These are the usage " \
        "conditions that the user has agreed to in relation to the use of the " 
\
        "HaikuDepotServer service."
 
@@ -49,7 +49,7 @@
 UserUsageConditionsWindow::UserUsageConditionsWindow(Model& model,
        UserUsageConditions& userUsageConditions)
        :
-       BWindow(WINDOW_FRAME, B_TRANSLATE("User Usage Conditions"),
+       BWindow(WINDOW_FRAME, B_TRANSLATE("Usage conditions"),
                        B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
                        B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS
                                | B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
@@ -82,7 +82,7 @@ UserUsageConditionsWindow::UserUsageConditionsWindow(Model& 
model,
 UserUsageConditionsWindow::UserUsageConditionsWindow(
        Model& model, UserUsageConditionsSelectionMode mode)
        :
-       BWindow(WINDOW_FRAME, B_TRANSLATE("User Usage Conditions"),
+       BWindow(WINDOW_FRAME, B_TRANSLATE("Usage conditions"),
                        B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
                        B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS
                                | B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
@@ -91,7 +91,7 @@ UserUsageConditionsWindow::UserUsageConditionsWindow(
        fWorkerThread(-1)
 {
        if (mode != LATEST)
-               debugger("only the LATEST user usage conditions are handled for 
now");
+               debugger("only the LATEST usage conditions are handled for 
now");
 
        _InitUiControls();
 
@@ -222,7 +222,7 @@ UserUsageConditionsWindow::_FetchData()
        if (-1 != fWorkerThread)
                debugger("illegal state - attempt to fetch, but fetch in 
progress");
        thread_id thread = spawn_thread(&_FetchDataThreadEntry,
-               "Fetch user usage conditions data", B_NORMAL_PRIORITY, this);
+               "Fetch usage conditions data", B_NORMAL_PRIORITY, this);
        if (thread >= 0) {
                fWorkerIndicator->Start();
                _SetWorkerThread(thread);
@@ -265,9 +265,9 @@ UserUsageConditionsWindow::_FetchDataPerform()
                BMessenger(this).SendMessage(&dataMessage);
        } else {
                AppUtils::NotifySimpleError(
-                       B_TRANSLATE("User Usage Conditions Download Problem"),
-                       B_TRANSLATE("An error has arisen downloading the user 
usage "
-                               "conditions.  Check the log for details and try 
again."));
+                       B_TRANSLATE("Usage conditions download problem"),
+                       B_TRANSLATE("An error has arisen downloading the usage "
+                               "conditions. Check the log for details and try 
again."));
                BMessenger(this).SendMessage(B_QUIT_REQUESTED);
        }
 


Other related posts:

  • » [haiku-commits] haiku: hrev53499 - in src/apps/haikudepot: ui server - humdinger