diff --git a/api-server/src/server/boot/certificate.js b/api-server/src/server/boot/certificate.js index 1bc230b3c4..67c0c4d650 100644 --- a/api-server/src/server/boot/certificate.js +++ b/api-server/src/server/boot/certificate.js @@ -157,8 +157,7 @@ function sendCertifiedEmail( isInfosecCertV7, isSciCompPyCertV7, isDataAnalysisPyCertV7, - isMachineLearningPyCertV7, - isRelationalDatabaseCertV8 + isMachineLearningPyCertV7 }, send$ ) { @@ -173,8 +172,7 @@ function sendCertifiedEmail( !isInfosecCertV7 || !isSciCompPyCertV7 || !isDataAnalysisPyCertV7 || - !isMachineLearningPyCertV7 || - !isRelationalDatabaseCertV8 + !isMachineLearningPyCertV7 ) { return Observable.just(false); } diff --git a/client/i18n/locales/english/intro.json b/client/i18n/locales/english/intro.json index c8821dfe6f..42882436c0 100644 --- a/client/i18n/locales/english/intro.json +++ b/client/i18n/locales/english/intro.json @@ -411,7 +411,7 @@ } }, "relational-database": { - "title": "Relational Database (Beta)", + "title": "Relational Database", "intro": [ "For these courses, you will use real developer tools and software including VS Code, PostgreSQL, and the Linux / Unix command line to complete interactive tutorials and build projects.", "These courses start off with basic Bash commands. Using the terminal, you will learn everything from navigating and manipulating a file system, scripting in Bash, all the way to advanced usage.", @@ -458,62 +458,62 @@ "title": "Learn Advanced Bash by Building a Kitty Ipsum Translator", "intro": [ "There's more to Bash commands than you might think.", - "In this 140-lesson course, you will learn some more complex commands, and the details of how commands work." + "In this 140 lesson course, you will learn some more complex commands, and the details of how commands work." ] }, "learn-bash-and-sql-by-building-a-bike-rental-shop": { "title": "Learn Bash and SQL by Building a Bike Rental Shop", "intro": [ - "In this 210-lesson course, you will build an interactive Bash program that stores rental information for your bike rental shop using PostgreSQL." + "In this 210 lesson course, you will build an interactive Bash program that stores rental information for your bike rental shop using PostgreSQL." ] }, "learn-bash-by-building-a-boilerplate": { "title": "Learn Bash by Building a Boilerplate", "intro": [ "The terminal allows you to send text commands to your computer that can manipulate the file system, run programs, automate tasks, and much more.", - "In this 170-lesson course, you will learn terminal commands by creating a website boilerplate using only the command line." + "In this 170 lesson course, you will learn basic commands by creating a website boilerplate using only the command line." ] }, "learn-bash-scripting-by-building-five-programs": { "title": "Learn Bash Scripting by Building Five Programs", "intro": [ "Bash scripts combine terminal commands and logic into programs that can execute or automate tasks, and much more.", - "In this 220-lesson course, you will learn more terminal commands and how to use them within Bash scripts by creating five small programs." + "In this 220 lesson course, you will learn more terminal commands and how to use them within Bash scripts by creating five small programs." ] }, "learn-git-by-building-an-sql-reference-object": { "title": "Learn Git by Building an SQL Reference Object", "intro": [ "Git is a version control system that keeps track of all the changes you make to your codebase.", - "In this 240-lesson course, you will learn how Git keeps track of your code by creating an object containing commonly used SQL commands." + "In this 240 lesson course, you will learn how Git keeps track of your code by creating an object containing commonly used SQL commands." ] }, "learn-nano-by-building-a-castle": { "title": "Learn Nano by Building a Castle", "intro": [ "Nano is a program that allows you to edit files right in the terminal.", - "In this 40-lesson course, you will learn how to edit files in the terminal with Nano while building a castle." + "In this 40 lesson course, you will learn how to edit files in the terminal with Nano while building a castle." ] }, "learn-relational-databases-by-building-a-mario-database": { "title": "Learn Relational Databases by Building a Mario Database", "intro": [ "A relational database organizes data into tables that are linked together through relationships.", - "In this 165-lesson course, you will learn the basics of a relational database by creating a PostgreSQL database filled with video game characters." + "In this 165 lesson course, you will learn the basics of a relational database by creating a PostgreSQL database filled with video game characters." ] }, "learn-sql-by-building-a-student-database-part-1": { "title": "Learn SQL by Building a Student Database: Part 1", "intro": [ "SQL, or Structured Query Language, is the language for communicating with a relational database.", - "In this 140-lesson course, you will create a Bash script that uses SQL to enter information about your computer science students into PostgreSQL." + "In this 140 lesson course, you will create a Bash script that uses SQL to enter information about your computer science students into PostgreSQL." ] }, "learn-sql-by-building-a-student-database-part-2": { "title": "Learn SQL by Building a Student Database: Part 2", "intro": [ "SQL join commands are used to combine information from multiple tables in a relational database", - "In this 140-lesson course, you will complete your student database while diving deeper into SQL commands." + "In this 140 lesson course, you will complete your student database while diving deeper into SQL commands." ] } } diff --git a/client/i18n/locales/english/translations.json b/client/i18n/locales/english/translations.json index c06784727d..1341971cc6 100644 --- a/client/i18n/locales/english/translations.json +++ b/client/i18n/locales/english/translations.json @@ -298,7 +298,7 @@ "help-translate": "We are still translating the following certifications.", "help-translate-link": "Help us translate.", "project-preview-title": "Here's a preview of what you will build", - "github-required": "<0>Create a GitHub account if you don't have one. You'll need it when you create the virtual Linux server machine. This process may take a few minutes.", + "github-required": "A <0>GitHub account is required to run the project. You will need to create one if you haven't already.", "step-1": "Step 1: Complete the project", "step-2": "Step 2: Submit your code", "submit-public-url": "When you have completed the project, save all the required files into a public repository and submit the URL to it below.", diff --git a/client/src/client-only-routes/show-settings.tsx b/client/src/client-only-routes/show-settings.tsx index 5d89f60d56..c31ac63e98 100644 --- a/client/src/client-only-routes/show-settings.tsx +++ b/client/src/client-only-routes/show-settings.tsx @@ -27,7 +27,7 @@ import { import { User } from '../redux/prop-types'; import { submitNewAbout, updateUserFlag, verifyCert } from '../redux/settings'; -const { apiLocation } = envData; +const { apiLocation, deploymentEnv } = envData; // TODO: update types for actions interface ShowSettingsProps { @@ -202,8 +202,8 @@ export function ShowSettings(props: ShowSettingsProps): JSX.Element { username={username} verifyCert={verifyCert} /> - - + {deploymentEnv == 'staging' && } + {deploymentEnv == 'staging' && } diff --git a/client/src/components/settings/webhook-token.tsx b/client/src/components/settings/webhook-token.tsx index 417c30ac99..5dfd065d49 100644 --- a/client/src/components/settings/webhook-token.tsx +++ b/client/src/components/settings/webhook-token.tsx @@ -74,7 +74,7 @@ class WebhookToken extends Component { return isChallengePage ? ( <> {!webhookToken && ( -
+

{t('webhook-token.create-p1')}