Refactor slugify calls to remove stripAccents option for consistency

Author: myovchev

modules/@apostrophecms/attachment/index.js

@@ -421,10 +421,7 @@ module.exports = {
           _id: options.attachmentId ?? self.apos.util.generateId(),
           group: group.name,
           createdAt: new Date(),
-          name: self.apos.util.slugify(
-            path.basename(fileName, path.extname(fileName)),
-            { stripAccents: self.apos.i18n.shouldStripAccents(req) }
-          ),
+          name: self.apos.util.slugify(path.basename(fileName, path.extname(fileName))),
           title: self.apos.util.sortify(
             path.basename(fileName, path.extname(fileName))
           ),

modules/@apostrophecms/doc/index.js

@@ -218,12 +218,7 @@ module.exports = {
       '@apostrophecms/doc-type:beforeSave': {
         ensureSlugSortifyAndUpdatedAt(req, doc, options) {
           const manager = self.getManager(doc.type);
-          manager.ensureSlug(
-            doc,
-            {
-              stripAccents: self.apos.i18n.shouldStripAccents(req)
-            }
-          );
+          manager.ensureSlug(doc);
           _.each(manager.schema, function (field) {
             if (field.sortify) {
               doc[field.name + 'Sortified'] = self.apos.util.sortify(

modules/@apostrophecms/page-type/index.js

@@ -468,14 +468,14 @@ module.exports = {
       },
       // If the page does not yet have a slug, add one based on the
       // title; throw an error if there is no title
-      ensureSlug(page, { stripAccents } = {}) {
+      ensureSlug(page) {
         if (!page.slug || (!page.slug.match(/^\//))) {
           if (page.title) {
             // Parent-based slug would be better, but this is not an
             // async function and callers will typically have done
             // that already, so skip the overhead. This is just a fallback
             // for naive use of the APIs
-            page.slug = '/' + self.apos.util.slugify(page.title, { stripAccents });
+            page.slug = '/' + self.apos.util.slugify(page.title);
           } else {
             throw self.apos.error('invalid', 'Page has neither a slug beginning with / or a title, giving up');
           }

modules/@apostrophecms/piece-type/index.js

@@ -1146,10 +1146,10 @@ module.exports = {
       },
       // If the piece does not yet have a slug, add one based on the
       // title; throw an error if there is no title
-      ensureSlug(piece, { stripAccents } = {}) {
+      ensureSlug(piece) {
         if (!piece.slug || piece.slug === 'none') {
           if (piece.title) {
-            piece.slug = self.apos.util.slugify(piece.title, { stripAccents });
+            piece.slug = self.apos.util.slugify(piece.title);
           } else if (piece.slug !== 'none') {
             throw self.apos.error(
               'invalid',

modules/@apostrophecms/schema/lib/addFieldTypes.js

@@ -186,7 +186,6 @@ module.exports = (self) => {
     // (no slashes at all)
     convert (req, field, data, destination) {
       const options = self.getSlugFieldOptions(field, data);
-      options.stripAccents = self.apos.i18n.shouldStripAccents(req);
 
       destination[field.name] = self.apos.util.slugify(
         self.apos.launder.string(data[field.name]),

modules/@apostrophecms/util/index.js

@@ -291,12 +291,15 @@ module.exports = {
       // ONE punctuation character normally forbidden in slugs may
       // optionally be permitted by specifying it via options.allow.
       // The separator may be changed via options.separator.
-      // By default, accents are preserved. To strip accents,
-      // set options.stripAccents to true.
+      // By default, the i18n.options.stripUrlAccents option is honored;
+      // having stripAccents passed as an option takes precedence.
       slugify(s, options) {
         const { stripAccents, ...opts } = options || {};
         const slug = require('sluggo')(s, opts);
-        if (stripAccents) {
+        const shouldStripAccents = (typeof stripAccents !== 'undefined')
+          ? stripAccents
+          : self.apos.i18n.options.stripUrlAccents;
+        if (shouldStripAccents) {
           return _.deburr(slug);
         }
         return slug;
@@ -945,8 +948,8 @@ module.exports = {
       // ONE punctuation character normally forbidden in slugs may
       // optionally be permitted by specifying it via options.allow.
       // The separator may be changed via options.separator.
-      // By default, accents are preserved. To strip accents,
-      // set options.stripAccents to true.
+      // By default, the i18n.options.stripUrlAccents option is honored;
+      // having stripAccents passed as an option takes precedence.
       slugify: function(string, options) {
         return self.slugify(string, options);
       },