Resolve merge conflict

Author: Ari

README.md

@@ -5,13 +5,9 @@ The Creative Commons License Chooser is meant to help people learn about CC lice
 ## About
 Repository containing the source code for the new Creative Commons License Chooser. The new chooser is still in beta, and a beta deployment can be found [here](https://chooser-beta.creativecommons.org/).
 
-This site is built using [Vue.js](https://vuejs.org/), [Bulma](https://bulma.io/), [Buefy](https://buefy.org/), and [Webpack](https://webpack.js.org/).
+This site is built using [Vue.js](https://vuejs.org/) (and vue-cli), and [Buefy](https://buefy.org/), among other things.
 
 #### Roadmap
-There is still some work to go before the new chooser is ready to replace the existing chooser. These tasks include:
- - Improvments to the Chooser's UI
- - Internationalization
- - Infrastructural work (Setting up analytics, monitoring, error logging)
 
 Tasks, issues, and discussion related to the release of the new chooser are tracked with the [`Launch Milestone`](https://github.com/creativecommons/cc-chooser/milestone/1).
 

src/components/HelpSection.vue

@@ -170,18 +170,20 @@
                 <p v-html="this.$t('help.how-licenses-communicated.text')" />
                 <table class="table is-hoverable is-fullwidth help-section__table">
                     <tbody>
-                        <tr>
-                            <th>{{ $t('help.how-licenses-communicated.full-name') }}</th>
-                            <td>{{ $t('help.how-licenses-communicated.CC-BY-SA') }}</td>
-                        </tr>
-                        <tr>
-                            <th>{{ $t('help.how-licenses-communicated.short-name') }}</th>
-                            <td>CC BY-NC</td>
-                        </tr>
-                        <tr>
-                            <th>{{ $t('help.how-licenses-communicated.license-icons') }}</th>
-                            <td><LicenseIconography :icon-list="['', 'by', 'nc']" /></td>
-                        </tr>
+                    <tr>
+                        <th>{{$t('help.how-licenses-communicated.full-name')}}</th>
+                        <td>{{$t('help.how-licenses-communicated.CC-BY-NC')}}</td>
+                    </tr>
+                    <tr>
+                        <th>{{$t('help.how-licenses-communicated.short-name')}}</th>
+                        <td>CC BY-NC</td>
+                    </tr>
+                    <tr>
+                        <th>{{$t('help.how-licenses-communicated.license-icons')}}</th>
+                        <td>
+                            <LicenseIcons :iconsArr="['by', 'nc']"/>
+                        </td>
+                    </tr>
                     </tbody>
                 </table>
             </section>
@@ -202,7 +204,7 @@
     </div>
 </template>
 <script>
-import LicenseIconography from './LicenseIconography'
+import LicenseIcons from './LicenseIcons'
 
 // eslint-disable-next-line
 const ModalForm = {
@@ -224,7 +226,7 @@ const ModalForm = {
 }
 export default {
     components: {
-        LicenseIconography
+        LicenseIcons
     },
     data() {
         return {

src/components/LicenseIconography.vue

@@ -168,7 +168,7 @@
             "full-name": "Full Name",
             "short-name": "Short Name",
             "license-icons": "Icons",
-            "CC-BY-SA": "Creative Commons Attribution 4.0 International"
+            "CC-BY-NC": "Attribution-NonCommercial 4.0 International"
         },
         "considerations-before-licensing": {
             "heading": "Considerations Before Licensing",

src/locales/en.json

@@ -8,12 +8,12 @@ This file will be used to document some useful commands and tips for tests. Also
 If you want to run only unit tests, use:
 
 ``` bash
-$ npm run unit
+$ npm run test:unit
 ```
 
 If you want to run only e2e tests, use:
 ``` bash
-$ npm run e2e
+$ npm run test:e2e
 ```
 
 ### About Snapshots Test