chromium/src
0
Fork 0
Code Activity

Localize student dropdown menu options (assignment list names)

Browse Source 
Bug: b/294681832
Change-Id: Ia43b3cf06c87bb73a34f29b60a6d9d3e698cfd98
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4775222
Commit-Queue: Artsiom Mitrokhin <amitrokhin@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1182840}
This commit is contained in:
Artsiom Mitrokhin
2023-08-11 23:08:43 +00:00
committed by Chromium LUCI CQ
parent b6ab2db263
commit f51d3d8dae
7 changed files with 27 additions and 9 deletions

12
ash/ash_strings.grd

@ -6889,6 +6889,18 @@ New install
<message name="IDS_GLANCEABLES_TASKS_TASK_ITEM_MARK_NOT_COMPLETED_ACCESSIBLE_NAME" desc="The glanceable displays tasks items fetched from Google Tasks API. This is the a11y name announced by ChromeVox for the checkbox button to mark a task as not completed.">
Mark as not completed
</message>
<message name="IDS_GLANCEABLES_CLASSROOM_STUDENT_DUE_SOON_LIST_NAME" desc="The glanceable displays classroom items fetched from Google Classroom API. This is the name of the list that contains assigned (pending / not completed) student assignments w/ due date in the future.">
Due soon
</message>
<message name="IDS_GLANCEABLES_CLASSROOM_STUDENT_NO_DUE_DATE_LIST_NAME" desc="The glanceable displays classroom items fetched from Google Classroom API. This is the name of the list that contains assigned (pending / not completed) student assignments w/o specified due date.">
No due date
</message>
<message name="IDS_GLANCEABLES_CLASSROOM_STUDENT_MISSING_LIST_NAME" desc="The glanceable displays classroom items fetched from Google Classroom API. This is the name of the list that contains assigned (pending / not completed) student assignments with missed due date.">
Missing
</message>
<message name="IDS_GLANCEABLES_CLASSROOM_STUDENT_DONE_LIST_NAME" desc="The glanceable displays classroom items fetched from Google Classroom API. This is the name of the list that contains completed student assignments.">
Done
</message>
<!-- Do Not Disturb notification -->
<message name="IDS_ASH_DO_NOT_DISTURB_NOTIFICATION_TITLE" desc="Label used for the notification that shows up when the 'Do Not Disturb' feature is enabled.">

1
ash/ash_strings_grd/IDS_GLANCEABLES_CLASSROOM_STUDENT_DONE_LIST_NAME.png.sha1 Normal file

@ -0,0 +1 @@
5c59a07c243651a7af29ade6d197fd60ac5301f1

1
ash/ash_strings_grd/IDS_GLANCEABLES_CLASSROOM_STUDENT_DUE_SOON_LIST_NAME.png.sha1 Normal file

@ -0,0 +1 @@
5c59a07c243651a7af29ade6d197fd60ac5301f1

1
ash/ash_strings_grd/IDS_GLANCEABLES_CLASSROOM_STUDENT_MISSING_LIST_NAME.png.sha1 Normal file

@ -0,0 +1 @@
5c59a07c243651a7af29ade6d197fd60ac5301f1

1
ash/ash_strings_grd/IDS_GLANCEABLES_CLASSROOM_STUDENT_NO_DUE_DATE_LIST_NAME.png.sha1 Normal file

@ -0,0 +1 @@
5c59a07c243651a7af29ade6d197fd60ac5301f1

18
ash/system/unified/classroom_bubble_student_view.cc

@ -10,7 +10,6 @@
#include "ash/glanceables/classroom/glanceables_classroom_client.h"
#include "ash/glanceables/classroom/glanceables_classroom_types.h"
#include "ash/glanceables/common/glanceables_progress_bar_view.h"
#include "ash/glanceables/glanceables_v2_controller.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
@ -43,13 +42,16 @@ constexpr std::array<StudentAssignmentsListType, 4>
StudentAssignmentsListType::kMissing,
StudentAssignmentsListType::kDone};
// TODO(b/283371050): Localize these strings once finalized.
constexpr auto kStudentAssignmentsListTypeToLabel =
base::MakeFixedFlatMap<StudentAssignmentsListType, base::StringPiece>(
{{StudentAssignmentsListType::kAssigned, "Assigned"},
{StudentAssignmentsListType::kNoDueDate, "No due date"},
{StudentAssignmentsListType::kMissing, "Missing"},
{StudentAssignmentsListType::kDone, "Done"}});
base::MakeFixedFlatMap<StudentAssignmentsListType, int>(
{{StudentAssignmentsListType::kAssigned,
IDS_GLANCEABLES_CLASSROOM_STUDENT_DUE_SOON_LIST_NAME},
{StudentAssignmentsListType::kNoDueDate,
IDS_GLANCEABLES_CLASSROOM_STUDENT_NO_DUE_DATE_LIST_NAME},
{StudentAssignmentsListType::kMissing,
IDS_GLANCEABLES_CLASSROOM_STUDENT_MISSING_LIST_NAME},
{StudentAssignmentsListType::kDone,
IDS_GLANCEABLES_CLASSROOM_STUDENT_DONE_LIST_NAME}});
constexpr char kClassroomWebUIAssignedUrl[] =
"https://classroom.google.com/u/0/a/not-turned-in/all";
@ -65,7 +67,7 @@ std::u16string GetAssignmentListName(size_t index) {
kStudentAssignmentsListTypeOrdered[index]);
CHECK(iter != kStudentAssignmentsListTypeToLabel.end());
return base::UTF8ToUTF16(iter->second);
return l10n_util::GetStringUTF16(iter->second);
}
class ClassroomStudentComboboxModel : public ui::ComboboxModel {

2
ash/system/unified/classroom_bubble_view_unittest.cc

@ -212,7 +212,7 @@ TEST_F(ClassroomBubbleStudentViewTest, RendersComboBoxView) {
ASSERT_TRUE(GetComboBoxView());
ASSERT_EQ(GetComboBoxView()->GetModel()->GetItemCount(), 4u);
EXPECT_EQ(GetComboBoxView()->GetModel()->GetItemAt(0), u"Assigned");
EXPECT_EQ(GetComboBoxView()->GetModel()->GetItemAt(0), u"Due soon");
EXPECT_EQ(GetComboBoxView()->GetModel()->GetItemAt(1), u"No due date");
EXPECT_EQ(GetComboBoxView()->GetModel()->GetItemAt(2), u"Missing");
EXPECT_EQ(GetComboBoxView()->GetModel()->GetItemAt(3), u"Done");